mirror of
https://github.com/gnustep/tools-make.git
synced 2025-04-23 06:10:50 +00:00
Do not run config.guess if ./configure provides hard-coded GNUSTEP_HOST*
values, and requires to use them git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@15701 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
parent
2dd1fa5cf8
commit
365f25eea1
2 changed files with 24 additions and 0 deletions
|
@ -39,6 +39,13 @@ setenv GNUSTEP_NETWORK_ROOT @GNUSTEP_NETWORK_ROOT@
|
|||
|
||||
setenv GNUSTEP_MAKEFILES ${GNUSTEP_SYSTEM_ROOT}/Makefiles
|
||||
|
||||
if ( "@GNUSTEP_MULTI_PLATFORM@" == "" ) then
|
||||
setenv GNUSTEP_HOST @target@
|
||||
setenv GNUSTEP_HOST_CPU @clean_target_cpu@
|
||||
setenv GNUSTEP_HOST_VENDOR @clean_target_vendor@
|
||||
setenv GNUSTEP_HOST_OS @clean_target_os@
|
||||
endif
|
||||
|
||||
#
|
||||
# Determine the host information
|
||||
#
|
||||
|
|
|
@ -73,6 +73,23 @@ GNUSTEP_LOCAL_ROOT=@GNUSTEP_LOCAL_ROOT@
|
|||
GNUSTEP_NETWORK_ROOT=@GNUSTEP_NETWORK_ROOT@
|
||||
export GNUSTEP_LOCAL_ROOT GNUSTEP_NETWORK_ROOT
|
||||
|
||||
# If multi-platform support is disabled, just use the hardcoded cpu,
|
||||
# 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 - but then you can't source GNUstep.sh
|
||||
# without having gcc, binutils, libc6-dev installed. Which can be a
|
||||
# problem for end-users who are not developers and have no development
|
||||
# tools installed. 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*.
|
||||
if [ -z "@GNUSTEP_MULTI_PLATFORM@" ]; then
|
||||
GNUSTEP_HOST=@target@
|
||||
GNUSTEP_HOST_CPU=@clean_target_cpu@
|
||||
GNUSTEP_HOST_VENDOR=@clean_target_vendor@
|
||||
GNUSTEP_HOST_OS=@clean_target_os@
|
||||
fi
|
||||
|
||||
#
|
||||
# Determine the host information
|
||||
#
|
||||
|
|
Loading…
Reference in a new issue