i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Check HAIKU_ADD_ALTERNATIVE_GCC_LIBS against 1 to allow a setting of 0 to

Browse Source 
work as usual.
* Automatic whitespace cleanup.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@36382 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2010-04-20 18:44:54 +00:00
parent 089cfbf774
commit 2cb706444f
2 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/HaikuImage
+2 -1
View File
@@ -642,7 +642,8 @@ if $(HAIKU_IMAGE_OPTIONAL_PACKAGE_DESCRIPTIONS) {
# GCC and unzip onto our image. Building the archive is done by a sub-jam. # GCC and unzip onto our image. Building the archive is done by a sub-jam.
include [ FDirName $(HAIKU_BUILD_RULES_DIR) AlternativeGCCArchive ] ; include [ FDirName $(HAIKU_BUILD_RULES_DIR) AlternativeGCCArchive ] ;
if $(HAIKU_ADD_ALTERNATIVE_GCC_LIBS) && $(HAIKU_ALTERNATIVE_GCC_OUTPUT_DIR) { if $(HAIKU_ADD_ALTERNATIVE_GCC_LIBS) = 1
&& $(HAIKU_ALTERNATIVE_GCC_OUTPUT_DIR) {
# let another jam build a zip with the system libraries # let another jam build a zip with the system libraries
rule InvokeSubJam target : directory : jamLine rule InvokeSubJam target : directory : jamLine
{ {
build/jam/OptionalPackages
+2 -1
View File
@@ -6,7 +6,8 @@
# packages. (It does not matter if a package was built with either compiler, # packages. (It does not matter if a package was built with either compiler,
# the system should have the respective other system libs.) # the system should have the respective other system libs.)
local isHybridBuild ; local isHybridBuild ;
if $(HAIKU_ADD_ALTERNATIVE_GCC_LIBS) && $(HAIKU_ALTERNATIVE_GCC_OUTPUT_DIR) { if $(HAIKU_ADD_ALTERNATIVE_GCC_LIBS) = 1
&& $(HAIKU_ALTERNATIVE_GCC_OUTPUT_DIR) {
isHybridBuild = 1 ; isHybridBuild = 1 ;
} }