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

Replace hardcoded defines by substrings from $(HAIKU_GCC_MACHINE). 

OSTYPE is still set to BeOS, I know some scripts check for it... will need to be fixed.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@29926 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
François Revol 2009-04-05 10:51:04 +00:00
parent dc54109d98
commit def8fff107
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/bin/bash/Jamfile
View File

@ -2,7 +2,17 @@ SubDir HAIKU_TOP src bin bash ;
SetSubDirSupportedPlatformsBeOSCompatible ;
SubDirCcFlags -DHAVE_CONFIG_H -DPROGRAM='\"bash\"' -DCONF_HOSTTYPE='\"i586\"' -DCONF_OSTYPE='\"beos\"' -DCONF_MACHTYPE='\"i586-pc-beos\"' -DCONF_VENDOR='\"pc\"' -DSHELL ;
# split the canonical target string
local cpuName = [ Match "([^-]*)-.*" : $(HAIKU_GCC_MACHINE) ] ;
local vendorName = [ Match "[^-]*-([^-]*)" : $(HAIKU_GCC_MACHINE) ] ;
local osName = [ Match "[^-]*-[^-]*-([^-]*)" : $(HAIKU_GCC_MACHINE) ] ;
SubDirCcFlags -DHAVE_CONFIG_H -DPROGRAM='\"bash\"' -DSHELL ;
SubDirCcFlags -DCONF_MACHTYPE='\"$(HAIKU_GCC_MACHINE)\"' ;
SubDirCcFlags -DCONF_HOSTTYPE='\"$(cpuName)\"' ;
SubDirCcFlags -DCONF_VENDOR='\"$(vendorName)\"' ;
#SubDirCcFlags -DCONF_OSTYPE='\"$(osName)\"' ;
SubDirCcFlags -DCONF_OSTYPE='\"beos\"' ;
# filter warnings we don't want here
TARGET_WARNING_CCFLAGS = [ FFilter $(TARGET_WARNING_CCFLAGS)