Use strip provided by the cross-tools.

This allows a 32-bit host to successfully build x86_64.
haiku · Jan 4, 2013 · 35f3908 · 35f3908
1 parent 7845676
commit 35f3908
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 1 deletion.
diff --git a/build/jam/Haiku64Image b/build/jam/Haiku64Image
@@ -519,6 +519,7 @@ AddTargetVariableToScript $(script) : <build>rc ;
 AddTargetVariableToScript $(script) : <build>resattr ;
 AddTargetVariableToScript $(script) : <build>unzip ;
 AddTargetVariableToScript $(script) : <build>vmdkimage ;
+AddTargetVariableToScript $(script) : $(HAIKU_STRIP) : stripCommand ;
 if $(HOST_RM_ATTRS_TARGET) {
 	AddTargetVariableToScript $(script) : $(HOST_RM_ATTRS_TARGET) : rmAttrs ;
 } else {

diff --git a/build/jam/HaikuImage b/build/jam/HaikuImage
@@ -913,6 +913,7 @@ AddTargetVariableToScript $(script) : <build>rc ;
 AddTargetVariableToScript $(script) : <build>resattr ;
 AddTargetVariableToScript $(script) : <build>unzip ;
 AddTargetVariableToScript $(script) : <build>vmdkimage ;
+AddTargetVariableToScript $(script) : $(HAIKU_STRIP) : stripCommand ;
 if $(HOST_RM_ATTRS_TARGET) {
 	AddTargetVariableToScript $(script) : $(HOST_RM_ATTRS_TARGET) : rmAttrs ;
 } else {

diff --git a/build/scripts/build_haiku_image b/build/scripts/build_haiku_image
@@ -31,6 +31,7 @@ set -o errexit
 # The following is only for cd types:
 # generate_attribute_stores
 # isCD
+# stripCommand
 #
 if [ $# -gt 0 ]; then
 	. $1
@@ -151,7 +152,7 @@ stripDebugInfo()
 	if [ "$elfMarker" = 'ELF' ]; then
 		# make user-writable first -- some files aren't
 		chmod u+w "$file"
-		strip --strip-debug "$file"
+		"$stripCommand" --strip-debug "$file"
 	fi
 }
 

diff --git a/configure b/configure
@@ -90,6 +90,7 @@ environment variables:
   HAIKU_OBJCOPY               The objcopy to be used. Defaults to "objcopy".
   HAIKU_RANLIB                The static library indexer. Defaults to "ranlib".
   HAIKU_YASM                  The yasm assembler (x86 only).
+  HAIKU_STRIP                 The strip command. Defaults to "strip".
   HAIKU_CPPFLAGS              The preprocessor flags. Defaults to "".
   HAIKU_CCFLAGS               The C flags. Defaults to "".
   HAIKU_CXXFLAGS              The C++ flags. Defaults to "".
@@ -364,6 +365,7 @@ set_default_value HAIKU_OBJCOPY		objcopy
 set_default_value HAIKU_RANLIB		ranlib
 set_default_value HAIKU_ELFEDIT		elfedit
 set_default_value HAIKU_YASM		yasm
+set_default_value HAIKU_STRIP		strip
 set_default_value HAIKU_CPPFLAGS	""
 set_default_value HAIKU_CCFLAGS		""
 set_default_value HAIKU_CXXFLAGS	""
@@ -529,6 +531,7 @@ if [ -n "$crossToolsPrefix" ]; then
 	get_build_tool_path LD ld
 	get_build_tool_path OBJCOPY objcopy
 	get_build_tool_path RANLIB ranlib
+	get_build_tool_path STRIP strip
 fi
 
 # prepare gcc settings
@@ -602,6 +605,7 @@ HAIKU_OBJCOPY				?= ${HAIKU_OBJCOPY} ;
 HAIKU_RANLIB				?= ${HAIKU_RANLIB} ;
 HAIKU_ELFEDIT				?= ${HAIKU_ELFEDIT} ;
 HAIKU_YASM					?= ${HAIKU_YASM} ;
+HAIKU_STRIP					?= ${HAIKU_STRIP} ;
 HAIKU_CPPFLAGS				?= ${HAIKU_CPPFLAGS} ;
 HAIKU_CCFLAGS				?= ${HAIKU_CCFLAGS} ;
 HAIKU_C++FLAGS				?= ${HAIKU_CXXFLAGS} ;