[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    playground/devtools/waf/wafadmin/Tools
From:       Thomas Nagy <tnagyemail-mail () yahoo ! fr>
Date:       2006-07-31 22:29:18
Message-ID: 1154384958.983155.27590.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 568371 by tnagy:

Do not share the LINK var, in case if g++ and gcc are used at the same time.


 M  +2 -2      g++.py  
 M  +2 -2      gcc.py  


--- trunk/playground/devtools/waf/wafadmin/Tools/g++.py #568370:568371
@@ -10,7 +10,7 @@
 # is called when a build process is started 
 def setup(env):
 	cpp_str = '${CXX} ${CXXFLAGS} ${CPPFLAGS} ${_CXXINCFLAGS} ${CXX_SRC_F}${SRC} \
                ${CXX_TGT_F}${TGT}'
-	link_str = '${LINK} ${CPPLNK_SRC_F}${SRC} ${CPPLNK_TGT_F}${TGT} ${LINKFLAGS} \
${_LIBDIRFLAGS} ${_LIBFLAGS}' +	link_str = '${LINK_CXX} ${CPPLNK_SRC_F}${SRC} \
${CPPLNK_TGT_F}${TGT} ${LINKFLAGS} ${_LIBDIRFLAGS} ${_LIBFLAGS}'  
 	Action.simple_action('cpp', cpp_str, color='GREEN')
 
@@ -61,7 +61,7 @@
 	v['CXXFLAGS_ULTRADEBUG'] = ['-g3', '-O0', '-DDEBUG']
 
 	# linker	
-	v['LINK']                = comp
+	v['LINK_CXX']            = comp
 	v['LIB']                 = []
 
 	v['CPPLNK_TGT_F']        = '-o '
--- trunk/playground/devtools/waf/wafadmin/Tools/gcc.py #568370:568371
@@ -10,7 +10,7 @@
 # is called when a build process is started 
 def setup(env):
 	cc_str = '${CC} ${CCFLAGS} ${CPPFLAGS} ${_CCINCFLAGS} ${CC_SRC_F}${SRC} \
                ${CC_TGT_F}${TGT}'
-	link_str = '${LINK} ${CCLNK_SRC_F}${SRC} ${CCLNK_TGT_F}${TGT} ${LINKFLAGS} \
${_LIBDIRFLAGS} ${_LIBFLAGS}' +	link_str = '${LINK_CC} ${CCLNK_SRC_F}${SRC} \
${CCLNK_TGT_F}${TGT} ${LINKFLAGS} ${_LIBDIRFLAGS} ${_LIBFLAGS}'  
         Action.simple_action('cc', cc_str, 'GREEN')
 
@@ -55,7 +55,7 @@
 	v['CCFLAGS_ULTRADEBUG']   = ['-g3', '-O0', '-DDEBUG']
 		
 	# linker	
-	v['LINK']                 = comp
+	v['LINK_CC']              = comp
 	v['LIB']                  = []
 	v['CCLNK_SRC_F']          = ''
 	v['CCLNK_TGT_F']          = '-o '


[prev in list] [next in list] [prev in thread] [next in thread]