From 72639addbb91a9e5fb45eaeb8f9fbe66e37e57f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= Date: Mon, 20 Apr 2009 20:49:09 +0000 Subject: [PATCH] Absolutely no reason to put BeOS compat symlinks on non x86-gcc2 images. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@30285 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- build/jam/OptionalPackages | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/build/jam/OptionalPackages b/build/jam/OptionalPackages index 44d57389c3..edf1a93fde 100644 --- a/build/jam/OptionalPackages +++ b/build/jam/OptionalPackages @@ -122,13 +122,19 @@ if [ IsOptionalHaikuImagePackageAdded BeHappy ] { # BeOSCompatibility if [ IsOptionalHaikuImagePackageAdded BeOSCompatibility ] { - Echo "Warning: Adding BeOS compatibility symlinks. This will go away. Please fix your apps!" ; - AddSymlinkToHaikuImage beos : ../system/apps ; - AddSymlinkToHaikuImage beos : ../system/bin ; - AddSymlinkToHaikuImage beos : ../system/documentation ; - AddSymlinkToHaikuImage beos : ../system/etc ; - AddSymlinkToHaikuImage beos : ../system/preferences ; - AddSymlinkToHaikuImage beos : ../system ; + if $(TARGET_ARCH) != x86 { + Echo "No optional package BeOSCompatibility available for $(TARGET_ARCH)" ; + } else if $(HAIKU_GCC_VERSION[1]) >= 4 && $(isHybridBuild) = 0 { + Echo "No optional package BeOSCompatibility available for gcc4" ; + } else { + Echo "Warning: Adding BeOS compatibility symlinks. This will go away. Please fix your apps!" ; + AddSymlinkToHaikuImage beos : ../system/apps ; + AddSymlinkToHaikuImage beos : ../system/bin ; + AddSymlinkToHaikuImage beos : ../system/documentation ; + AddSymlinkToHaikuImage beos : ../system/etc ; + AddSymlinkToHaikuImage beos : ../system/preferences ; + AddSymlinkToHaikuImage beos : ../system ; + } }