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

* Update the GCC4 package. This package has the builtin __BEOS__ define removed

Browse Source 
and also comes with proper default includes.
* If installing GCC4 as part of a GCC2 based hybrid build, re-setup the gnupro
  link that is overwritten by the GCC4 package.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@29085 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Michael Lotz
2009-01-29 01:25:23 +00:00
parent cfd0c07711
commit 76043ac59a
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/OptionalPackages
+11 -2
View File
@@ -268,10 +268,19 @@ if [ IsOptionalHaikuImagePackageAdded Development ] && $(TARGET_ARCH) = x86 {
if $(HAIKU_GCC_VERSION[1]) = 4 || $(isHybridBuild) = 1 { if $(HAIKU_GCC_VERSION[1]) = 4 || $(isHybridBuild) = 1 {
# gcc and binutils # gcc and binutils
local baseURL = http://haiku.mlotz.ch ; local baseURL = http://haiku.mlotz.ch ;
InstallOptionalHaikuImagePackage gcc-4.3.3-haiku-090125 InstallOptionalHaikuImagePackage gcc-4.3.3-haiku-090129
: $(baseURL)/gcc-4.3.3-haiku-090125.zip : $(baseURL)/gcc-4.3.3-haiku-090129.zip
: :
; ;
# Setup the proper gnupro symlink. Both packages provide one and on
# a GCC2 based hybrid the GCC4 package will overwrite the one present.
# Since we want to use GCC2 as the host compiler on a GCC2 base we have
# to correct this again.
if $(HAIKU_GCC_VERSION[1]) = 2 {
AddSymlinkToHaikuImage develop tools
: /boot/develop/tools/gcc-2.95.3-haiku-081024 : gnupro ;
}
} }
} }