From d939b024988d18bd1512e124568dbec603d2f7ec Mon Sep 17 00:00:00 2001 From: Harald Klimach Date: Mon, 12 Sep 2011 10:01:35 +0200 Subject: [PATCH] Ups, missed the cxx LINKFLAGS, when moving them for all compilers. --- waflib/Tools/cxx.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/waflib/Tools/cxx.py b/waflib/Tools/cxx.py index 6ec992e2..033ce21d 100644 --- a/waflib/Tools/cxx.py +++ b/waflib/Tools/cxx.py @@ -25,7 +25,7 @@ class cxx(Task.Task): class cxxprogram(link_task): "Link object files into a c++ program" - run_str = '${LINK_CXX} ${CXXLNK_SRC_F}${SRC} ${CXXLNK_TGT_F}${TGT[0].abspath()} ${LINKFLAGS} ${RPATH_ST:RPATH} ${FRAMEWORKPATH_ST:FRAMEWORKPATH} ${FRAMEWORK_ST:FRAMEWORK} ${ARCH_ST:ARCH} ${STLIB_MARKER} ${STLIBPATH_ST:STLIBPATH} ${STLIB_ST:STLIB} ${SHLIB_MARKER} ${LIBPATH_ST:LIBPATH} ${LIB_ST:LIB}' + run_str = '${LINK_CXX} ${LINKFLAGS} ${CXXLNK_SRC_F}${SRC} ${CXXLNK_TGT_F}${TGT[0].abspath()} ${RPATH_ST:RPATH} ${FRAMEWORKPATH_ST:FRAMEWORKPATH} ${FRAMEWORK_ST:FRAMEWORK} ${ARCH_ST:ARCH} ${STLIB_MARKER} ${STLIBPATH_ST:STLIBPATH} ${STLIB_ST:STLIB} ${SHLIB_MARKER} ${LIBPATH_ST:LIBPATH} ${LIB_ST:LIB}' vars = ['LINKDEPS'] ext_out = ['.bin'] inst_to = '${BINDIR}'