[haiku-commits] haiku: hrev49050 - build/scripts

  • From: revol@xxxxxxx
  • To: haiku-commits@xxxxxxxxxxxxx
  • Date: Sat, 18 Apr 2015 15:15:04 +0200 (CEST)

hrev49050 adds 1 changeset to branch 'master'
old head: 859686a51c1d8da1eccf42fbe3623b3243f4b84b
new head: 1c91ed03fa74c5e847fc153157be2344189df066
overview:
http://cgit.haiku-os.org/haiku/log/?qt=range&q=1c91ed03fa74+%5E859686a51c1d

----------------------------------------------------------------------------

1c91ed03fa74: Build binutils with different extra targets depending on arch

EFI support isn't much useful for ARM.

Also add some targets to help debugging binutils on PPC.

[ François Revol <revol@xxxxxxx> ]

----------------------------------------------------------------------------

Revision: hrev49050
Commit: 1c91ed03fa74c5e847fc153157be2344189df066
URL: http://cgit.haiku-os.org/haiku/commit/?id=1c91ed03fa74
Author: François Revol <revol@xxxxxxx>
Date: Sat Apr 18 13:11:32 2015 UTC

----------------------------------------------------------------------------

1 file changed, 13 insertions(+), 1 deletion(-)
build/scripts/build_cross_tools_gcc4 | 14 +++++++++++++-

----------------------------------------------------------------------------

diff --git a/build/scripts/build_cross_tools_gcc4
b/build/scripts/build_cross_tools_gcc4
index 0b20a83..7fac834 100755
--- a/build/scripts/build_cross_tools_gcc4
+++ b/build/scripts/build_cross_tools_gcc4
@@ -18,12 +18,19 @@ additionalMakeArgs=$*

ccFlags="-O2"
cxxFlags="-O2"
+binutilsTargets="$haikuMachine"
case $haikuMachine in
+i586-*)
+ binutilsConfigureArgs="--disable-multilib"
+ gccConfigureArgs="--disable-multilib"
+ binutilsTargets="$binutilsTargets,i386-efi-pe,x86_64-efi-pe"
+ ;;
x86_64-*)
# GCC's default is to enable multilib, but there is a bug when
# explicitly using --enable-multilib that causes a build
# failure
binutilsConfigureArgs=""
+ binutilsTargets="$binutilsTargets,i386-efi-pe,x86_64-efi-pe"
;;
m68k-*)
binutilsConfigureArgs="--enable-multilib"
@@ -41,6 +48,11 @@ arm-*)
binutilsConfigureArgs="$binutilsConfigureArgs --disable-tls"
gccConfigureArgs="$gccConfigureArgs --disable-tls"
;;
+powerpc-*)
+ binutilsConfigureArgs="--disable-multilib"
+ gccConfigureArgs="--disable-multilib"
+
binutilsTargets="$binutilsTargets,powerpc-apple-linux,powerpc-apple-freebsd,powerpc-apple-vxworks"
+ ;;
*)
binutilsConfigureArgs="--disable-multilib"
gccConfigureArgs="--disable-multilib"
@@ -147,7 +159,7 @@ export LC_ALL=POSIX
cd "$binutilsObjDir"
CFLAGS="$ccFlags" CXXFLAGS="$cxxFlags" "$binutilsSourceDir/configure" \
--prefix="$installDir" $buildHostSpec --target=$haikuMachine \
- --enable-targets=$haikuMachine,i386-efi-pe,x86_64-efi-pe \
+ --enable-targets=$binutilsTargets \
--disable-nls --disable-shared --disable-werror \
--with-sysroot="$sysrootDir" \
$binutilsConfigureArgs \


Other related posts:

  • » [haiku-commits] haiku: hrev49050 - build/scripts - revol