i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use strip provided by the cross-tools.

Browse Source 
This allows a 32-bit host to successfully build x86_64.
This commit is contained in:
Matt Madia
2013-01-04 12:42:26 +00:00
parent 7845676a3e
commit 35f3908149
4 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/Haiku64Image
+1
View File
@@ -519,6 +519,7 @@ AddTargetVariableToScript $(script) : <build>rc ;
AddTargetVariableToScript $(script) : <build>resattr ; AddTargetVariableToScript $(script) : <build>resattr ;
AddTargetVariableToScript $(script) : <build>unzip ; AddTargetVariableToScript $(script) : <build>unzip ;
AddTargetVariableToScript $(script) : <build>vmdkimage ; AddTargetVariableToScript $(script) : <build>vmdkimage ;
AddTargetVariableToScript $(script) : $(HAIKU_STRIP) : stripCommand ;
if $(HOST_RM_ATTRS_TARGET) { if $(HOST_RM_ATTRS_TARGET) {
AddTargetVariableToScript $(script) : $(HOST_RM_ATTRS_TARGET) : rmAttrs ; AddTargetVariableToScript $(script) : $(HOST_RM_ATTRS_TARGET) : rmAttrs ;
} else { } else {
build/jam/HaikuImage
+1
View File
@@ -913,6 +913,7 @@ AddTargetVariableToScript $(script) : <build>rc ;
AddTargetVariableToScript $(script) : <build>resattr ; AddTargetVariableToScript $(script) : <build>resattr ;
AddTargetVariableToScript $(script) : <build>unzip ; AddTargetVariableToScript $(script) : <build>unzip ;
AddTargetVariableToScript $(script) : <build>vmdkimage ; AddTargetVariableToScript $(script) : <build>vmdkimage ;
AddTargetVariableToScript $(script) : $(HAIKU_STRIP) : stripCommand ;
if $(HOST_RM_ATTRS_TARGET) { if $(HOST_RM_ATTRS_TARGET) {
AddTargetVariableToScript $(script) : $(HOST_RM_ATTRS_TARGET) : rmAttrs ; AddTargetVariableToScript $(script) : $(HOST_RM_ATTRS_TARGET) : rmAttrs ;
} else { } else {
build/scripts/build_haiku_image
+2 -1
View File
@@ -31,6 +31,7 @@ set -o errexit
# The following is only for cd types: # The following is only for cd types:
# generate_attribute_stores # generate_attribute_stores
# isCD # isCD
# stripCommand
# #
if [ $# -gt 0 ]; then if [ $# -gt 0 ]; then
. $1 . $1
@@ -151,7 +152,7 @@ stripDebugInfo()
if [ "$elfMarker" = 'ELF' ]; then if [ "$elfMarker" = 'ELF' ]; then
# make user-writable first -- some files aren't # make user-writable first -- some files aren't
chmod u+w "$file" chmod u+w "$file"
strip --strip-debug "$file" "$stripCommand" --strip-debug "$file"
fi fi
} }
configure
Vendored
+4
View File
@@ -90,6 +90,7 @@ environment variables:
HAIKU_OBJCOPY The objcopy to be used. Defaults to "objcopy". HAIKU_OBJCOPY The objcopy to be used. Defaults to "objcopy".
HAIKU_RANLIB The static library indexer. Defaults to "ranlib". HAIKU_RANLIB The static library indexer. Defaults to "ranlib".
HAIKU_YASM The yasm assembler (x86 only). HAIKU_YASM The yasm assembler (x86 only).
HAIKU_STRIP The strip command. Defaults to "strip".
HAIKU_CPPFLAGS The preprocessor flags. Defaults to "". HAIKU_CPPFLAGS The preprocessor flags. Defaults to "".
HAIKU_CCFLAGS The C flags. Defaults to "". HAIKU_CCFLAGS The C flags. Defaults to "".
HAIKU_CXXFLAGS 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_RANLIB ranlib
set_default_value HAIKU_ELFEDIT elfedit set_default_value HAIKU_ELFEDIT elfedit
set_default_value HAIKU_YASM yasm set_default_value HAIKU_YASM yasm
set_default_value HAIKU_STRIP strip
set_default_value HAIKU_CPPFLAGS "" set_default_value HAIKU_CPPFLAGS ""
set_default_value HAIKU_CCFLAGS "" set_default_value HAIKU_CCFLAGS ""
set_default_value HAIKU_CXXFLAGS "" set_default_value HAIKU_CXXFLAGS ""
@@ -529,6 +531,7 @@ if [ -n "$crossToolsPrefix" ]; then
get_build_tool_path LD ld get_build_tool_path LD ld
get_build_tool_path OBJCOPY objcopy get_build_tool_path OBJCOPY objcopy
get_build_tool_path RANLIB ranlib get_build_tool_path RANLIB ranlib
get_build_tool_path STRIP strip
fi fi
# prepare gcc settings # prepare gcc settings
@@ -602,6 +605,7 @@ HAIKU_OBJCOPY ?= ${HAIKU_OBJCOPY} ;
HAIKU_RANLIB ?= ${HAIKU_RANLIB} ; HAIKU_RANLIB ?= ${HAIKU_RANLIB} ;
HAIKU_ELFEDIT ?= ${HAIKU_ELFEDIT} ; HAIKU_ELFEDIT ?= ${HAIKU_ELFEDIT} ;
HAIKU_YASM ?= ${HAIKU_YASM} ; HAIKU_YASM ?= ${HAIKU_YASM} ;
HAIKU_STRIP ?= ${HAIKU_STRIP} ;
HAIKU_CPPFLAGS ?= ${HAIKU_CPPFLAGS} ; HAIKU_CPPFLAGS ?= ${HAIKU_CPPFLAGS} ;
HAIKU_CCFLAGS ?= ${HAIKU_CCFLAGS} ; HAIKU_CCFLAGS ?= ${HAIKU_CCFLAGS} ;
HAIKU_C++FLAGS ?= ${HAIKU_CXXFLAGS} ; HAIKU_C++FLAGS ?= ${HAIKU_CXXFLAGS} ;