[Xorp-cvs] SF.net SVN: xorp:[11589] trunk/xorp/SConstruct

bms_fbsd at users.sourceforge.net bms_fbsd at users.sourceforge.net
Thu Nov 26 14:36:04 PST 2009


Revision: 11589
          http://xorp.svn.sourceforge.net/xorp/?rev=11589&view=rev
Author:   bms_fbsd
Date:     2009-11-26 22:36:04 +0000 (Thu, 26 Nov 2009)

Log Message:
-----------
POSIX strip has no options by the strict letter of the law.
Assume we have GNU binutils strip until proven otherwise.

Modified Paths:
--------------
    trunk/xorp/SConstruct

Modified: trunk/xorp/SConstruct
===================================================================
--- trunk/xorp/SConstruct	2009-11-26 21:41:16 UTC (rev 11588)
+++ trunk/xorp/SConstruct	2009-11-26 22:36:04 UTC (rev 11589)
@@ -25,7 +25,6 @@
 # TODO Add separate toolchain test for GNU varargs macros.
 # TODO Fix default include/lib paths, pass in from environment.
 # TODO Merge scons-unfamiliar syntactic sugar from YHC's sconsfiles.
-# TODO support non-gnu strip
 # TODO support static *and* shared library build in same tree/run
 # TODO conditionalize new directory layout here
 
@@ -136,6 +135,13 @@
     env['strip'] = True
 print 'Strip binaries:   ', env.has_key('strip')
 
+# POSIX strip has no options by the strict letter of the law.
+# Assume we have GNU binutils strip until proven otherwise.
+gnustrip = True
+env['_STRIP_UNNEEDED'] = ""
+if gnustrip:
+    env['_STRIP_UNNEEDED'] = "--strip-unneeded"
+
 if env['shared']:
     env['SHAREDLIBS'] = "defined"
 print 'Shared libraries: ', env.has_key('SHAREDLIBS')
@@ -189,7 +195,7 @@
     for i in obj:
 	env.AddPostAction(i, env.Chmod(str(i), perm))
 	if env['strip']:
-	    env.AddPostAction(i, Action("$STRIP --strip-unneeded $TARGET"))
+	    env.AddPostAction(i, Action("$STRIP $_STRIP_UNNEEDED $TARGET"))
     return obj
 SConsEnvironment.InstallLibrary = InstallLibrary
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.



More information about the Xorp-cvs mailing list