X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Fconfig.mk.in;h=daa6d699c950744e0b82287de0784858fa3a8a8d;hb=b98f161bba5030db590c50728fa60be342e5edc7;hp=da5d957f8069d2bd6f12e25f7d8df4751326429d;hpb=15575cf8f17fee0fdd3151c5dbb0a0f89b01c708;p=ghc-hetmet.git

diff --git a/mk/config.mk.in b/mk/config.mk.in
index da5d957..daa6d69 100644
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -187,8 +187,19 @@ XMLDocWays=
 
 # Mac OS X deployment target (to cross-compile for older OS versions)
 #
-MACOS_DEPLOYMENT_VERSION = @MACOS_DEPLOYMENT_VERSION@
-MACOS_DEPLOYMENT_SDK = @MACOS_DEPLOYMENT_SDK@
+MACOSX_DEPLOYMENT_VERSION = @MACOSX_DEPLOYMENT_VERSION@
+MACOSX_DEPLOYMENT_SDK = @MACOSX_DEPLOYMENT_SDK@
+
+ifneq "$(MACOSX_DEPLOYMENT_VERSION)" ""
+MACOSX_DEPLOYMENT_CC_OPTS = -mmacosx-version-min=$(MACOSX_DEPLOYMENT_VERSION) \
+			    -isysroot $(MACOSX_DEPLOYMENT_SDK)
+MACOSX_DEPLOYMENT_LD_OPTS = -mmacosx-version-min=$(MACOSX_DEPLOYMENT_VERSION) \
+			    -Wl,-syslibroot,$(MACOSX_DEPLOYMENT_SDK)
+# We don't extend SRC_CC_OPTS and friends here directly, as (a) they may get
+# overwritten in build.mk and (b) we must not use the deployment options in
+# stage 1 or we get a linker error if the bootstrap compiler is for a more 
+# recent OS version.
+endif
 
 ################################################################################
 #
@@ -338,6 +349,9 @@ MakefileDeps=YES
 #------------------------------------------------------------------------------
 # Options for Libraries
 
+# Which directory (in libraries/) contains the integer library?
+INTEGER_LIBRARY=integer-gmp
+
 # What extra ways to build the libraries in
 # In addition to the normal sequential way, the default is to also build
 # profiled prelude libraries.
@@ -849,8 +863,8 @@ EXECUTABLE_FILE = chmod +x
 GHC		= @WithGhc@
 GhcDir          = $(dir $(GHC))
 
-# Set to YES if $(GHC) has the readline package installed
-GhcHasReadline	= @GhcHasReadline@
+# Set to YES if $(GHC) has the editline package installed
+GhcHasEditline	= @GhcHasEditline@
 
 HBC		= @HBC@
 NHC		= @NHC@