mirror of
https://github.com/gnustep/tools-make.git
synced 2025-04-23 22:33:28 +00:00
Fixed last change to deal with CC
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@31287 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
parent
8d78fcfdc7
commit
49e3f2a43e
2 changed files with 14 additions and 3 deletions
|
@ -1,3 +1,8 @@
|
|||
2010-09-10 Nicola Pero <nicola.pero@meta-innovation.com>
|
||||
|
||||
* config.make.in (CC): Ignore the default CC=cc used by GNU make
|
||||
when nothing else is specified.
|
||||
|
||||
2010-09-09 Nicola Pero <nicola.pero@meta-innovation.com>
|
||||
|
||||
* config.make.in (CC): Only set CC if not already set in the
|
||||
|
|
|
@ -31,9 +31,15 @@ MAKE_WITH_INFO_FUNCTION = @MAKE_WITH_INFO_FUNCTION@
|
|||
# Binary and compile tools
|
||||
#
|
||||
|
||||
# If CC is already set in the environment, don't override it but use
|
||||
# the provided compiler. This makes it easier to swap compilers on
|
||||
# the fly.
|
||||
# Ignore the default CC=cc used by GNU make when nothing is specified;
|
||||
# in that case, we want to use our own default CC.
|
||||
ifeq ($(origin CC), default)
|
||||
CC = @CC@
|
||||
endif
|
||||
|
||||
# If CC is already set but not from the GNU make default (ie, in the
|
||||
# environment), don't override it but use the provided compiler. This
|
||||
# makes it easier to swap compilers on the fly.
|
||||
ifeq ($(CC),)
|
||||
CC = @CC@
|
||||
endif
|
||||
|
|
Loading…
Reference in a new issue