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

Removed duplicated code that was already in names.make

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@21867 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Nicola Pero 2005-10-23 16:51:06 +00:00
parent 04de3be7af
commit 3950f5d843
2 changed files with 11 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2005-10-23 Nicola Pero <n.pero@mi.flashnet.it>
* config.make.in: Removed code to compute GNUSTEP_HOST,
GNUSTEP_HOST_CPU, etc, when in GNUSTEP_MULTI_PLATFORM mode -- this
is already done by names.make later.
2005-10-23 Nicola Pero <n.pero@mi.flashnet.it>
This change is key to no longer having to source GNUstep.sh when

27
config.make.in
View file

@ -223,32 +223,15 @@ endif
# vendor and os determined when gnustep-make was configured. The
# reason using the hardcoded ones might be better is that config.guess
# and similar scripts might even require compiling test files to
# determine the platform - which is horribly slow. To prevent this
# problem, unless we were configured to determine the platform at run
# time, by default we use the hardcoded values of GNUSTEP_HOST*.
# determine the platform - which is horribly slow (that is done in
# names.make if GNUSTEP_HOST is not yet set at that stage). To
# prevent this problem, unless we were configured to determine the
# platform at run time, by default we use the hardcoded values of
# GNUSTEP_HOST*.
ifeq ("@GNUSTEP_MULTI_PLATFORM@","")
GNUSTEP_HOST = @target@
GNUSTEP_HOST_CPU = @clean_target_cpu@
GNUSTEP_HOST_VENDOR = @clean_target_vendor@
GNUSTEP_HOST_OS = @clean_target_os@
else
#
# Determine the host information
#
ifeq ($(GNUSTEP_HOST),)
GNUSTEP_HOST := $(shell (cd /tmp; $(GNUSTEP_MAKEFILES)/config.sub `$(GNUSTEP_MAKEFILES)/config.guess`))
endif
ifeq ($(GNUSTEP_HOST_CPU),)
GNUSTEP_HOST_CPU := $(shell ($(GNUSTEP_MAKEFILES)/clean_cpu.sh `$(GNUSTEP_MAKEFILES)/cpu.sh $(GNUSTEP_HOST)`))
endif
ifeq ($(GNUSTEP_HOST_VENDOR),)
GNUSTEP_HOST_VENDOR := $(shell ($(GNUSTEP_MAKEFILES)/clean_vendor.sh `$(GNUSTEP_MAKEFILES)/vendor.sh $(GNUSTEP_HOST)`))
endif
ifeq ($(GNUSTEP_HOST_OS),)
GNUSTEP_HOST_OS := $(shell ($(GNUSTEP_MAKEFILES)/clean_os.sh `$(GNUSTEP_MAKEFILES)/os.sh $(GNUSTEP_HOST)`))
endif
endif