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

* Clean that up a bit and combine the ifs for GCC2/4.

Browse Source 
* Also don't install the GCC2 package on a GCC4 based hybrid, as it's again not
  usable without proper manual setup.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@29160 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Michael Lotz
2009-02-08 12:47:29 +00:00
parent b97c244e6e
commit fbac0185ad
1 changed files with 16 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/OptionalPackages
+16 -22
View File
@@ -211,25 +211,28 @@ if [ IsOptionalHaikuImagePackageAdded Development ] && $(TARGET_ARCH) = x86 {
AddHeaderDirectoryToHaikuImage libs png : 3rdparty ;
AddHeaderDirectoryToHaikuImage libs zlib : 3rdparty ;
if $(HAIKU_GCC_VERSION[1]) > 2 {
# gcc 4
# symlink cpp to g++'s headers
AddSymlinkToHaikuImage develop headers
: /boot/develop/tools/gnupro/include/g++ : cpp ;
} else {
# gcc 2.95.3
AddHeaderDirectoryToHaikuImage cpp ;
}
if $(HAIKU_GCC_VERSION[1]) = 2 || $(isHybridBuild) = 1 {
if $(HAIKU_GCC_VERSION[1]) = 2 {
# gcc and binutils
local baseURL = http://haiku-files.org/files/optional-packages ;
InstallOptionalHaikuImagePackage gcc-2.95.3-haiku-081024
: $(baseURL)/gcc-2.95.3-haiku-081024.zip
:
;
AddHeaderDirectoryToHaikuImage cpp ;
}
if $(HAIKU_GCC_VERSION[1]) = 4 {
# gcc and binutils
local baseURL = http://haiku.mlotz.ch ;
InstallOptionalHaikuImagePackage gcc-4.3.3-haiku-090129
: $(baseURL)/gcc-4.3.3-haiku-090129.zip
:
;
# symlink cpp to g++'s headers
AddSymlinkToHaikuImage develop headers
: /boot/develop/tools/gnupro/include/g++ : cpp ;
}
# other tools
@@ -265,15 +268,6 @@ if [ IsOptionalHaikuImagePackageAdded Development ] && $(TARGET_ARCH) = x86 {
: $(baseURL)/texinfo-4.13a-gcc2-2008-11-09.zip
:
;
if $(HAIKU_GCC_VERSION[1]) = 4 {
# gcc and binutils
local baseURL = http://haiku.mlotz.ch ;
InstallOptionalHaikuImagePackage gcc-4.3.3-haiku-090129
: $(baseURL)/gcc-4.3.3-haiku-090129.zip
:
;
}
}