X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=distrib%2FMacOS%2FMakefile;h=3928d34fa71ae26c851c184d2ad9f49630922a14;hb=d70136c3a53cc08098458bf2a60b1657e71c6697;hp=7f4698a719c3cbb8d6138102eea0e243c96f2393;hpb=160cec311bcb566640023124a97ca1d5a1b61a0d;p=ghc-hetmet.git

diff --git a/distrib/MacOS/Makefile b/distrib/MacOS/Makefile
index 7f4698a..3928d34 100644
--- a/distrib/MacOS/Makefile
+++ b/distrib/MacOS/Makefile
@@ -7,7 +7,11 @@
 #	framework-pkg  [MacOS only]
 #		Builds /Library/Frameworks/GHC.framework wrapped into a Mac
 #		installer package; must be executed in a ./configure'd tree
-#		(--prefix doesn't matter as it will be overridden)
+#		(--prefix doesn't matter as it will be overridden); other
+#		./configure arguments are passed through, unless overwritten
+#		with XCODE_EXTRA_CONFIGURE_ARGS.  A deployment target can
+#		be specified by setting the corresponding ./configure
+#		argument or by setting MACOSX_DEPLOYMENT_TARGET.
 #
 #	framework-binary-dist  [MacOS only]
 #		Builds GHC.framework encapsulating a binary distribution
@@ -16,8 +20,13 @@
 #
 ############################################################################
 
-TOP=../..
-include $(TOP)/mk/boilerplate.mk
+include ../../mk/config.mk
+
+ifeq "$(ProjectVersion)" ""
+$(error Please run ./configure first)
+endif
+
+include ../../mk/custom-settings.mk
 
 # The ProjectVersionInt is GHC's idea of an API version and hence determines
 # the framework version.
@@ -34,6 +43,27 @@ SHORT_VERSION_STRING = $(ProjectVersion)
 # Name of the installer package
 PACKAGE_NAME = GHC-$(ProjectVersion)-$(TargetArch_CPP).pkg
 
+# Determine arguments that should be passed to ./configure from within Xcode
+#
+# By default, we pass whatever was used when the present tree was configured.
+# The user can override this by setting XCODE_EXTRA_CONFIGURE_ARGS.  If
+# MACOSX_DEPLOYMENT_TARGET is set, the target is added to whatever arguments
+# are passed.
+export XCODE_EXTRA_CONFIGURE_ARGS
+ifeq "$(XCODE_EXTRA_CONFIGURE_ARGS)" ""
+XCODE_EXTRA_CONFIGURE_ARGS = $(shell echo $(CONFIGURE_ARGS))
+endif
+ifneq "$(MACOSX_DEPLOYMENT_TARGET)" ""
+XCODE_EXTRA_CONFIGURE_ARGS += --with-macosx-deployment-target=$(MACOSX_DEPLOYMENT_TARGET)
+endif
+
+# Determine whether we need to pass a "-target" option to packagemaker
+#
+# If a deployment target has been set, we use the same target for packagemaker.
+ifneq "$(MACOSX_DEPLOYMENT_TARGET)" ""
+PACKAGEMAKER_TARGET = -target $(MACOSX_DEPLOYMENT_TARGET)
+endif
+
 # Xcode's installation build product location (this is where the GHC.framework
 # is assembled)
 DSTROOT=/tmp/GHC.dst
@@ -53,17 +83,31 @@ PACKAGEMAKER=/Developer/usr/bin/packagemaker
 #   and permissions for all files (as well as prevent correct setting of those
 #   for files that are not in the content list).
 framework-pkg:
-	-chmod -R u+w $(DSTROOT)
+	-chmod -fR u+w $(DSTROOT)
 	-$(RM) -rf $(DSTROOT)
 	mkdir -p $(TOOLS_SYSTEM)
 	cp installer-scripts/Uninstaller $(TOOLS_SYSTEM)
-	xcodebuild -target GHC-systemwide clean 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 -o $(TOP)/$(PACKAGE_NAME)
+	$(PACKAGEMAKER) -v --doc GHC-system.pmdoc\
+			$(PACKAGEMAKER_TARGET) -o $(TOP)/$(PACKAGE_NAME) -i org.haskell.GHC
+
+# 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