[haiku-commits] haiku: hrev45127 - in build: jam scripts
- From: mattmadia@xxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Fri, 4 Jan 2013 18:41:58 +0100 (CET)
hrev45127 adds 1 changeset to branch 'master'
old head: 7845676a3efb8efb83195f99d46a24aec288dfa1
new head: 35f390814940144bf74048de3ff56d863adf6938
overview: http://cgit.haiku-os.org/haiku/log/?qt=range&q=35f3908+%5E7845676
----------------------------------------------------------------------------
35f3908: Use strip provided by the cross-tools.
This allows a 32-bit host to successfully build x86_64.
[ Matt Madia <mattmadia@xxxxxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev45127
Commit: 35f390814940144bf74048de3ff56d863adf6938
URL: http://cgit.haiku-os.org/haiku/commit/?id=35f3908
Author: Matt Madia <mattmadia@xxxxxxxxx>
Date: Fri Jan 4 12:40:20 2013 UTC
----------------------------------------------------------------------------
4 files changed, 8 insertions(+), 1 deletion(-)
build/jam/Haiku64Image | 1 +
build/jam/HaikuImage | 1 +
build/scripts/build_haiku_image | 3 ++-
configure | 4 ++++
----------------------------------------------------------------------------
diff --git a/build/jam/Haiku64Image b/build/jam/Haiku64Image
index cc6224c..c077535 100644
--- 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
index 020b9fc..614d5f7 100644
--- 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
index 155e5f6..6be56b5 100755
--- 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
index f0df8eb..1edc558 100755
--- 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} ;
Other related posts:
