From def8fff107b6c904d0700075f62da9b30ab5da18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= Date: Sun, 5 Apr 2009 10:51:04 +0000 Subject: [PATCH] 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 --- src/bin/bash/Jamfile | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/bin/bash/Jamfile b/src/bin/bash/Jamfile index a3b301cafc..e35a45261b 100644 --- a/src/bin/bash/Jamfile +++ b/src/bin/bash/Jamfile @@ -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)