2213 Add CONFIGURE_DEFAULT_COMPILERS
authorAndrew Stormont <andyjstormont@gmail.com>
Wed, 07 Mar 2012 12:52:51 +0000
changeset 491 57540878a121
parent 490 0de5925f0c53
child 492 feb4ae69ab0d
2213 Add CONFIGURE_DEFAULT_COMPILERS
components/gcc3/Makefile
make-rules/configure.mk
--- a/components/gcc3/Makefile	Sat Feb 25 11:03:48 2012 +0000
+++ b/components/gcc3/Makefile	Wed Mar 07 12:52:51 2012 +0000
@@ -30,6 +30,10 @@
 COMPONENT_ARCHIVE_HASH=	sha1:f7a27d5aeb07748eb6e924abfcfcf469c378b13e
 COMPONENT_ARCHIVE_URL=	$(EXTERNAL_ARCHIVE_MIRROR)/$(SOURCE_ARCHIVE)
 
+# we need to override CONFIGURE_DEFAULT_COMPILERS because GCC uses a configure that
+# can't deal with CC as an argument
+CONFIGURE_DEFAULT_COMPILERS= no
+
 include ../../make-rules/prep.mk
 include ../../make-rules/configure.mk
 include ../../make-rules/ips.mk
@@ -50,10 +54,6 @@
 
 CONFIGURE_PREFIX =	/usr/sfw
 
-# we need to override CONFIGURE_OPTIONS because GCC uses a configure that
-# can't deal with CC as an argument
-CONFIGURE_OPTIONS =	 --prefix=$(CONFIGURE_PREFIX)
-CONFIGURE_OPTIONS +=	 --mandir=$(CONFIGURE_MANDIR)
 CONFIGURE_OPTIONS +=	 --infodir=$(CONFIGURE_PREFIX)/share/info
 CONFIGURE_OPTIONS +=	--without-gnu-ld --with-ld=/usr/bin/ld
 CONFIGURE_OPTIONS +=	--enable-languages='c,c++,f77,objc'
--- a/make-rules/configure.mk	Sat Feb 25 11:03:48 2012 +0000
+++ b/make-rules/configure.mk	Wed Mar 07 12:52:51 2012 +0000
@@ -70,10 +70,13 @@
 
 CONFIGURE_ENV = CONFIG_SHELL="$(CONFIG_SHELL)"
 
+CONFIGURE_DEFAULT_COMPILERS?=yes
 CONFIGURE_DEFAULT_DIRS?=yes
 
+ifeq ($(CONFIGURE_DEFAULT_COMPILERS),yes)
 CONFIGURE_OPTIONS += CC="$(CC)"
 CONFIGURE_OPTIONS += CXX="$(CXX)"
+endif
 CONFIGURE_OPTIONS += --prefix=$(CONFIGURE_PREFIX)
 ifeq ($(CONFIGURE_DEFAULT_DIRS),yes)
 CONFIGURE_OPTIONS += --mandir=$(CONFIGURE_MANDIR)