[commit: ghc] master: Remove the MACOSX_DEPLOYMENT stuff; fixes #7559 (cd31b29)

[Ian Lynagh]

Repository : ssh://darcs.haskell.org//srv/darcs/ghc

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/cd31b294fcff964ecea6f78f20e7d5743a853631

>---------------------------------------------------------------

commit cd31b294fcff964ecea6f78f20e7d5743a853631
Author: Ian Lynagh <ian at well-typed.com>
Date:   Sun Feb 17 17:20:04 2013 +0000

    Remove the MACOSX_DEPLOYMENT stuff; fixes #7559
    
    If anyone wants to do this in the future, they should just set
    appropriate CC_OPTS/LD_OPTS variables instead.

>---------------------------------------------------------------

 aclocal.m4           |   29 -----------------------------
 configure.ac         |   17 -----------------
 mk/config.mk.in      |   21 ---------------------
 rts/ghc.mk           |    5 -----
 utils/lndir/Makefile |    6 ------
 5 files changed, 0 insertions(+), 78 deletions(-)

diff --git a/aclocal.m4 b/aclocal.m4
index 607363e..deedafe 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1728,35 +1728,6 @@ AC_DEFUN([FP_GMP],
   AC_SUBST(GMP_LIB_DIRS)
 ])# FP_GMP
 
-# FP_CHECK_MACOSX_DEPLOYMENT_TARGET
-# ---------------------------------
-AC_DEFUN([FP_CHECK_MACOSX_DEPLOYMENT_TARGET],
-[
-if test "x$TargetOS_CPP-$TargetVendor_CPP" = "xdarwin-apple"; then
-  AC_MSG_CHECKING([Mac OS X deployment target])
-  case $FP_MACOSX_DEPLOYMENT_TARGET in
-    none)  ;;
-    10.4)  MACOSX_DEPLOYMENT_VERSION=10.4
-    	   MACOSX_DEPLOYMENT_SDK=/Developer/SDKs/MacOSX10.4u.sdk
-	   ;;
-    10.4u) MACOSX_DEPLOYMENT_VERSION=10.4
-    	   MACOSX_DEPLOYMENT_SDK=/Developer/SDKs/MacOSX10.4u.sdk
-	   ;;
-    *)     MACOSX_DEPLOYMENT_VERSION=$FP_MACOSX_DEPLOYMENT_TARGET
-    	   MACOSX_DEPLOYMENT_SDK=/Developer/SDKs/MacOSX${FP_MACOSX_DEPLOYMENT_TARGET}.sdk
-	   ;;
-  esac
-  if test "x$FP_MACOSX_DEPLOYMENT_TARGET" = "xnone"; then
-    AC_MSG_RESULT(none)
-  else
-    if test ! -d $MACOSX_DEPLOYMENT_SDK; then
-      AC_MSG_ERROR([Unknown deployment target $FP_MACOSX_DEPLOYMENT_TARGET])
-    fi
-    AC_MSG_RESULT([${MACOSX_DEPLOYMENT_VERSION} (${MACOSX_DEPLOYMENT_SDK})])
-  fi
-fi
-])
-
 # --------------------------------------------------------------
 # Calculate absolute path to build tree
 # --------------------------------------------------------------
diff --git a/configure.ac b/configure.ac
index 98b84c2..78a157b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -498,23 +498,6 @@ FIND_LLVM_PROG([OPT], [opt], [opt])
 OptCmd="$OPT"
 AC_SUBST([OptCmd])
 
-dnl ** Mac OS X: explicit deployment target
-dnl --------------------------------------------------------------
-AC_ARG_WITH([macosx-deployment-target],
-[AC_HELP_STRING([--with-macosx-deployment-target=VERSION],
-        [Build for Mac OS VERSION and higher  (default= version of build host)])],
-[FP_MACOSX_DEPLOYMENT_TARGET="$withval"
- if test "x$TargetOS_CPP-$TargetVendor_CPP" != "xdarwin-apple"; then
-   # ignore everywhere, but on Mac OS
-   AC_MSG_WARN([--macosx-deployment-target is only available on Mac OS X])
-   FP_MACOSX_DEPLOYMENT_TARGET=none
- fi],
-[FP_MACOSX_DEPLOYMENT_TARGET=none]
-)
-FP_CHECK_MACOSX_DEPLOYMENT_TARGET
-AC_SUBST(MACOSX_DEPLOYMENT_VERSION)
-AC_SUBST(MACOSX_DEPLOYMENT_SDK)
-
 dnl --------------------------------------------------------------
 dnl End of configure script option section
 dnl --------------------------------------------------------------
diff --git a/mk/config.mk.in b/mk/config.mk.in
index fdc680f..519e285 100644
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -42,27 +42,6 @@ NO_INCLUDE_PKGDATA = NO
 # Should we build latex docs?
 LATEX_DOCS = NO
 
-# Mac OS X deployment target (to cross-compile for older OS versions)
-#
-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) \
-			    --no-builtin-fprintf
-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.
-#
-# We need --no-builtin-fprintf, as the use of the builtin function optimisation
-# for fprintf together with #include "PosixSource" in the RTS leads to the
-# use of fwrite$UNIX2003 (with GCC 4.0.1 on Mac OS X 10.5.2).
-endif
-
 ################################################################################
 #
 # Variables that control how the compiler itself is built
diff --git a/rts/ghc.mk b/rts/ghc.mk
index 7c2e746..ded0548 100644
--- a/rts/ghc.mk
+++ b/rts/ghc.mk
@@ -279,11 +279,6 @@ ifeq "$(UseLibFFIForAdjustors)" "YES"
 rts_CC_OPTS += -DUSE_LIBFFI_FOR_ADJUSTORS
 endif
 
-# Mac OS X: make sure we compile for the right OS version
-rts_CC_OPTS += $(MACOSX_DEPLOYMENT_CC_OPTS)
-rts_HC_OPTS += $(addprefix -optc, $(MACOSX_DEPLOYMENT_CC_OPTS))
-rts_LD_OPTS += $(addprefix -optl, $(MACOSX_DEPLOYMENT_LD_OPTS))
-
 # We *want* type-checking of hand-written cmm.
 rts_HC_OPTS += -dcmm-lint 
 
diff --git a/utils/lndir/Makefile b/utils/lndir/Makefile
index 43e61c1..ce09666 100644
--- a/utils/lndir/Makefile
+++ b/utils/lndir/Makefile
@@ -1,12 +1,6 @@
 TOP=../..
 include $(TOP)/mk/boilerplate.mk
 
-# Exclude for booting
-ifeq "$(stage)" "2"
-SRC_CC_OPTS += $(MACOSX_DEPLOYMENT_CC_OPTS)
-SRC_LD_OPTS += $(MACOSX_DEPLOYMENT_LD_OPTS)
-endif
-
 C_SRCS=lndir.c
 C_PROG=lndir