Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Applied (slighly modified) patch by Matt Madia: When the

Browse Source 
--alternative-gcc-output-dir configure option has been specified,
  HAIKU_ADD_ALTERNATIVE_GCC_LIBS is set by default. One has to explicitely
  unset it in UserBuildConfig to avoid building the alternative gcc libs.
* Adjusted documentation accordingly.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@29607 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Ingo Weinhold 2009-03-19 12:06:15 +00:00
parent c61af1596f
commit 292e63bf9f
3 changed files with 20 additions and 9 deletions

13
build/jam/UserBuildConfig.ReadMe

@ -128,12 +128,13 @@ AddOptionalHaikuImagePackages WonderBrush ;
# Add all available optional packages.
HAIKU_ADD_ALL_OPTIONAL_PACKAGES = 1 ;
# Add the libraries built with the alternative gcc version. The alternative
# gcc generated directory must have been specified via the configure option
# --alternative-gcc-output-dir. Note, that a sub-jam will be executed. When
# using a jam that is not simply invoked by "jam", set the JAM build variable
# accordingly.
HAIKU_ADD_ALTERNATIVE_GCC_LIBS = 1 ;
# Don't add the libraries built with the alternative gcc version.
# If the alternative gcc generated directory has been specified via the
# configure option --alternative-gcc-output-dir, the libraries for the
# alternative gcc version are added by default. Unsetting this variable disables
# building and adding the libraries. Ignored, if --alternative-gcc-output-dir
# was not specified.
HAIKU_ADD_ALTERNATIVE_GCC_LIBS = ;
# Specify scripts that shall be run when populating the image/installation
# directory. The "early" script is run before anything has been copied onto

6
build/jam/UserBuildConfig.sample

@ -20,7 +20,7 @@
# Add symlink/file (timezone and keymap settings) to the image.
#AddSymlinkToHaikuImage home config settings
# : /boot/beos/etc/timezones/Europe/Paris : timezone ;
#AddFilesToHaikuImage home config settings : <keymap>US-International
#AddFilesToHaikuImage home config settings : <keymap>US-International
# : Key_map ;
# Copy artwork to the image.
@ -33,5 +33,5 @@
# Add all available optional packages.
#HAIKU_ADD_ALL_OPTIONAL_PACKAGES = 1 ;
# Add the libraries built with the alternative gcc version.
#HAIKU_ADD_ALTERNATIVE_GCC_LIBS = 1 ;
# Don't add the libraries built with the alternative gcc version.
#HAIKU_ADD_ALTERNATIVE_GCC_LIBS = ;

10
configure vendored

@ -34,6 +34,13 @@ options:
a gcc 4 Haiku or vice versa). <dir> specifies the
output directory of the other gcc. The directory
must already be fully configured.
Note, that a sub-jam will be executed when
building Haiku. When using a jam that is not
simply invoked by "jam", the JAM build variable
needs to be set accordingly.
To disable building the alternative libraries
the variable HAIKU_ADD_ALTERNATIVE_GCC_LIBS can be
unset in the UserBuildConfig file.
--cross-tools-prefix <prefix>
Assume cross compilation. <prefix> should be a
path to the directory where the cross
@ -261,6 +268,7 @@ buildCrossTools=
buildCrossToolsScript="$sourceDir/build/scripts/build_cross_tools"
buildCrossToolsMachine=
alternativeGCCOutputDir=
addAlternativeGCCLibs=
haikuRequiredLegacyGCCVersion="2.95.3-haiku-081024"
export haikuRequiredLegacyGCCVersion
@ -303,6 +311,7 @@ while [ $# -gt 0 ] ; do
assertparam "$1" $#
cd $2 || exit 1
alternativeGCCOutputDir=`pwd`
addAlternativeGCCLibs=1
cd $currentDir
shift 2
;;
@ -427,6 +436,7 @@ HAIKU_USE_GCC_PIPE ?= "${useGCCPipe}" ;
HAIKU_HOST_USE_32BIT ?= "${use32bit}" ;
HAIKU_HOST_USE_XATTR ?= "${useXattr}" ;
HAIKU_ALTERNATIVE_GCC_OUTPUT_DIR ?= ${alternativeGCCOutputDir} ;
HAIKU_ADD_ALTERNATIVE_GCC_LIBS ?= ${addAlternativeGCCLibs} ;
HAIKU_GCC_RAW_VERSION ?= ${haikuGCCVersion} ;
HAIKU_GCC_MACHINE ?= ${haikuGCCMachine} ;