[haiku-commits] haiku: hrev47573 - /

  • From: zooey@xxxxxxxxxxxxxxx
  • To: haiku-commits@xxxxxxxxxxxxx
  • Date: Sat, 26 Jul 2014 11:22:58 +0200 (CEST)

hrev47573 adds 1 changeset to branch 'master'
old head: cb22f490a3c247420fc846788fc0d03749e5f96e
new head: 63701e7dd54ec05141df916ddfcf1d233af1c45b
overview: http://cgit.haiku-os.org/haiku/log/?qt=range&q=63701e7+%5Ecb22f49

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

63701e7: Add support for specifying the host compiler with CC.
  
  * On some systems, the host compiler may not be called 'gcc', so allow
    overriding the default via the CC environment variable.

                                    [ Oliver Tappe <zooey@xxxxxxxxxxxxxxx> ]

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

Revision:    hrev47573
Commit:      63701e7dd54ec05141df916ddfcf1d233af1c45b
URL:         http://cgit.haiku-os.org/haiku/commit/?id=63701e7
Author:      Oliver Tappe <zooey@xxxxxxxxxxxxxxx>
Date:        Sat Jul 26 09:21:51 2014 UTC

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

1 file changed, 9 insertions(+), 4 deletions(-)
configure | 13 +++++++++----

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

diff --git a/configure b/configure
index f02beea..94f2c0b 100755
--- a/configure
+++ b/configure
@@ -110,6 +110,7 @@ options:
                               less likely).
 
 environment variables:
+  CC                          The host compiler. Defaults to "gcc".
   HAIKU_AR_x86_gcc2           The static library archiver for x86_gcc2.
                               Defaults to "ar".
   HAIKU_CC_x86_gcc2           The x86_gcc2 compiler. Defaults to "gcc".
@@ -503,10 +504,14 @@ useGccGraphiteDefault=0
 unknownArchIndex=1
 haikuTargetArchs=
 
+if [ -z "$CC" ]; then
+       CC=gcc
+fi
+
 # exported (BuildSetup) default parameter values
 #
-HOST_GCC_RAW_VERSION=`gcc -dumpversion`
-HOST_GCC_MACHINE=`gcc -dumpmachine`
+HOST_GCC_RAW_VERSION=`$CC -dumpversion`
+HOST_GCC_MACHINE=`$CC -dumpmachine`
 HAIKU_INCLUDE_GPL_ADDONS=0
 HAIKU_INCLUDE_PATENTED_CODE=0
 HAIKU_INCLUDE_SOURCES=0
@@ -520,8 +525,8 @@ HAIKU_HOST_USE_XATTR=0
 HAIKU_HOST_USE_XATTR_REF=0
 HAIKU_HOST_BUILD_ONLY=0
 HOST_EXTENDED_REGEX_SED="sed -r"
-HOST_GCC_LD=`gcc -print-prog-name=ld`
-HOST_GCC_OBJCOPY=`gcc -print-prog-name=objcopy`
+HOST_GCC_LD=`$CC -print-prog-name=ld`
+HOST_GCC_OBJCOPY=`$CC -print-prog-name=objcopy`
 SFDISK_BINARY=sfdisk
 HOST_SFDISK=$SFDISK_BINARY
 HOST_SHA256=


Other related posts: