From: Derrick Brashear <shadow@dementia.org>
Date: Fri, 29 Jan 2010 17:59:59 +0000 (-0500)
Subject: macos prefpane fat binary arch selection correction
X-Git-Tag: openafs-devel-1_5_71~5
X-Git-Url: http://git.openafs.org/?p=openafs.git;a=commitdiff_plain;h=8b395497d5a464c57c65ba73ca757d47e4ff109a

macos prefpane fat binary arch selection correction

don't choose 64 bit arches for the prefpane if we're not on macos 10.6

sadly, this is the best i can do to conditionalize

Change-Id: I31fb2e10fbef5c66a27e0170e8925513a1b63050
Reviewed-on: http://gerrit.openafs.org/1180
Reviewed-by: Derrick Brashear <shadow@dementia.org>
Tested-by: Derrick Brashear <shadow@dementia.org>
---

diff --git a/src/platform/DARWIN/AFSPreference/OpenAFS.xcodeproj/project.pbxproj b/src/platform/DARWIN/AFSPreference/OpenAFS.xcodeproj/project.pbxproj
index 5d3c7f6..6683962 100644
--- a/src/platform/DARWIN/AFSPreference/OpenAFS.xcodeproj/project.pbxproj
+++ b/src/platform/DARWIN/AFSPreference/OpenAFS.xcodeproj/project.pbxproj
@@ -844,7 +844,9 @@
 		1DBD214A08BA80EA00186707 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
+				"ARCHS[sdk=macosx10.6]" = "$(ARCHS_STANDARD_32_64_BIT)";
+				"ARCHS[sdk=macosx10.5]" = "$(ARCHS_STANDARD_32_BIT)";
+				"ARCHS[sdk=macosx10.4u]" = "$(ARCHS_STANDARD_32_BIT)";
 				GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
 				GCC_MODEL_TUNING = G5;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
@@ -859,7 +861,9 @@
 		1DBD214D08BA80EA00186707 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
+				"ARCHS[sdk=macosx10.6]" = "$(ARCHS_STANDARD_32_64_BIT)";
+				"ARCHS[sdk=macosx10.5]" = "$(ARCHS_STANDARD_32_BIT)";
+				"ARCHS[sdk=macosx10.4u]" = "$(ARCHS_STANDARD_32_BIT)";
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
 				GCC_ENABLE_OBJC_GC = supported;
@@ -869,14 +873,16 @@
 				ONLY_ACTIVE_ARCH = NO;
 				PREBINDING = NO;
 				SKIP_INSTALL = NO;
-				VALID_ARCHS = "i386 ppc x86_64";
+				VALID_ARCHS = "i386 ppc x86_64 armv6";
 			};
 			name = Debug;
 		};
 		1DBD214E08BA80EA00186707 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
+				"ARCHS[sdk=macosx10.6]" = "$(ARCHS_STANDARD_32_64_BIT)";
+				"ARCHS[sdk=macosx10.5]" = "$(ARCHS_STANDARD_32_BIT)";
+				"ARCHS[sdk=macosx10.4u]" = "$(ARCHS_STANDARD_32_BIT)";
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
 				GCC_ENABLE_OBJC_GC = supported;
@@ -884,7 +890,7 @@
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				ONLY_ACTIVE_ARCH = NO;
 				PREBINDING = NO;
-				VALID_ARCHS = "i386 ppc x86_64";
+				VALID_ARCHS = "i386 ppc x86_64 armv6";
 			};
 			name = Release;
 		};
diff --git a/src/platform/DARWIN/Makefile.in b/src/platform/DARWIN/Makefile.in
index 612ab1f..a472af6 100644
--- a/src/platform/DARWIN/Makefile.in
+++ b/src/platform/DARWIN/Makefile.in
@@ -21,7 +21,16 @@ afscell/build/Release/afscell.bundle: afscell
 afscell/InstallerSections.plist: afscell 
 
 OpenAFS.prefPane:
-	xcodebuild -project AFSPreference/OpenAFS.xcodeproj
+	@case ${SYS_NAME} in \
+	*_darwin_100 ) \
+		xcodebuild -sdk macosx10.6 -project AFSPreference/OpenAFS.xcodeproj ;; \
+	*_darwin_90 ) \
+		xcodebuild -sdk macosx10.5 -project AFSPreference/OpenAFS.xcodeproj ;; \
+	*_darwin_80 ) \
+		xcodebuild -sdk macosx10.4 -project AFSPreference/OpenAFS.xcodeproj ;; \
+	* ) \
+		echo Not building AFS prefPane for ${SYS_NAME} ;; \
+	esac
 
 afscell:
 	cd afscell && xcodebuild