X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=distrib%2FMacOS%2FMakefile;h=d17e384d73ea91adb1706cd1f84ac811a6a3cc7c;hb=840554d7c158dd8759139f247f7f46c1f643d5a4;hp=5287292fc010a3cf0926dbad10d376d620879a36;hpb=63c2dd1dfa6e8ab87e5c2ebf47d43edfb9805c68;p=ghc-hetmet.git

diff --git a/distrib/MacOS/Makefile b/distrib/MacOS/Makefile
index 5287292..d17e384 100644
--- a/distrib/MacOS/Makefile
+++ b/distrib/MacOS/Makefile
@@ -82,15 +82,28 @@ framework-pkg:
 	-$(RM) -rf $(DSTROOT)
 	mkdir -p $(TOOLS_SYSTEM)
 	cp installer-scripts/Uninstaller $(TOOLS_SYSTEM)
-	xcodebuild -target GHC-systemwide clean build install\
+	xcodebuild -target GHC-systemwide clean build\
 		   CURRENT_PROJECT_VERSION=$(CURRENT_PROJECT_VERSION)\
 	    	   SHORT_VERSION_STRING=$(SHORT_VERSION_STRING)\
 	 	   FRAMEWORK_VERSION=$(FRAMEWORK_VERSION)\
-		   CURRENT_LIBRARY_VERSION=$(FRAMEWORK_VERSION)
+		   CURRENT_LIBRARY_VERSION=$(FRAMEWORK_VERSION)\
+		   COMMAND_MODE=unix2003
+	xcodebuild -target GHC-systemwide install\
+		   CURRENT_PROJECT_VERSION=$(CURRENT_PROJECT_VERSION)\
+	    	   SHORT_VERSION_STRING=$(SHORT_VERSION_STRING)\
+	 	   FRAMEWORK_VERSION=$(FRAMEWORK_VERSION)\
+		   CURRENT_LIBRARY_VERSION=$(FRAMEWORK_VERSION)\
+		   COMMAND_MODE=unix2003
 	-$(RM) -f GHC-system.pmdoc/*-contents.xml
 	$(PACKAGEMAKER) -v --doc GHC-system.pmdoc\
 			$(PACKAGEMAKER_TARGET) -o $(TOP)/$(PACKAGE_NAME)
 
+# If we don't specify COMMAND_MODE=unix2003 then xcodebuild defaults
+# to setting it to legacy, which means that ar builds archives
+# without a table of contents. That makes the build fail later on.
+
+
+
 # Instead of making 'binary-dist' a Makefile dependency, we let xcodebuild call
 # 'make binary-dist'.  This has the advantage that xcode knows the framework
 # path into which the distribution should be installed and can instruct