gnustep/tools-make
0
0
Fork 0
mirror of https://github.com/gnustep/tools-make.git synced 2025-04-23 22:33:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Make it easier to swap C++/ObjC++ compilers on the fly when using gnustep-make

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@32622 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Nicola Pero 2011-03-16 18:45:32 +00:00
parent 245bcce8aa
commit 99026b64da
2 changed files with 21 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2011-03-16 Nicola Pero <nicola.pero@meta-innovation.com>
* config.make.in (CXX): If CXX is specified on the environment or
command-line, use the specified value in preference to the one
hardcoded into gnustep-make. (From a suggestion by Banlu
Kemiyatorn <object@gmail.com>).
2011-03-16 Nicola Pero <nicola.pero@meta-innovation.com>
* GNUmakefile.in (rpm): Depend on svn-dist and updated

16
config.make.in
View file

@ -39,11 +39,24 @@ 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.
# makes it easier to swap C/ObjC compilers on the fly.
ifeq ($(CC),)
CC = @CC@
endif
# Ignore the default CXX=g++ used by GNU make when nothing is specified;
# in that case, we want to use our own default CXX.
ifeq ($(origin CC), default)
CXX = @CXX@
endif
# If CXX 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 C++/ObjC++ compilers on the fly.
ifeq ($(CXX),)
CXX = @CXX@
endif
# TODO: Because of the following, OPTFLAG usually ends up being '-g
# -O2'. The '-g' is fairly harmless as you can always use strip=yes
# which will strip the object files upon installation; still, it's not
@ -54,7 +67,6 @@ OBJCFLAGS= @OBJCFLAGS@
OBJC_LIB_FLAG = @OBJC_LIB_FLAG@
CPPFLAGS = @CPPFLAGS@
CPP = @CPP@
CXX = @CXX@
CCFLAGS = @CXXFLAGS@
# If the 'debug' variable is not specified on the command-line or in