Mac OS X deployment target: piping opts through Makefiles

10 files changed, 75 insertions, 0 deletions

diff --git a/utils/ghc-pkg/Makefile b/utils/ghc-pkg/Makefile
index 383524a6fd..b27a2f1187 100644
--- a/utils/ghc-pkg/Makefile
+++ b/utils/ghc-pkg/Makefile
@@ -4,6 +4,15 @@ include $(TOP)/mk/boilerplate.mk
 # -----------------------------------------------------------------------------
 # ghc-pkg.bin
 
+# Beyond stage 1, honour any Mac OS X depolyment target options.  If we use 
+# these options in stage 1 we get a linker error if the bootstrap compiler is
+#  for a more recent OS version
+ifeq "$(stage)" "2"
+SRC_CC_OPTS += $(MACOSX_DEPLOYMENT_CC_OPTS)
+SRC_HC_OPTS += $(addprefix -optc, $(MACOSX_DEPLOYMENT_CC_OPTS))
+SRC_LD_OPTS += $(addprefix -optl, $(MACOSX_DEPLOYMENT_LD_OPTS))
+endif
+
 SRC_HC_OPTS += -cpp -Wall -fno-warn-name-shadowing -fno-warn-unused-matches
 
 # This causes libghccompat.a to be used:
diff --git a/utils/hasktags/Makefile b/utils/hasktags/Makefile
index aa81c13093..20c52ba8d7 100644
--- a/utils/hasktags/Makefile
+++ b/utils/hasktags/Makefile
@@ -1,6 +1,15 @@
 TOP=../..
 include $(TOP)/mk/boilerplate.mk
 
+# Beyond stage 1, honour any Mac OS X depolyment target options.  If we use 
+# these options in stage 1 we get a linker error if the bootstrap compiler is
+#  for a more recent OS version
+ifeq "$(stage)" "2"
+SRC_CC_OPTS += $(MACOSX_DEPLOYMENT_CC_OPTS)
+SRC_HC_OPTS += $(addprefix -optc, $(MACOSX_DEPLOYMENT_CC_OPTS))
+SRC_LD_OPTS += $(addprefix -optl, $(MACOSX_DEPLOYMENT_LD_OPTS))
+endif
+
 # We have two version: the inplace version compiled by the bootstrap compiler
 #   and the install version compiled by the stage 1 compiler
 ifeq "$(stage)" "2"
diff --git a/utils/hp2ps/Makefile b/utils/hp2ps/Makefile
index 7952bbb961..09c193f1c1 100644
--- a/utils/hp2ps/Makefile
+++ b/utils/hp2ps/Makefile
@@ -1,6 +1,9 @@
 TOP=../..
 include $(TOP)/mk/boilerplate.mk
 
+SRC_CC_OPTS += $(MACOSX_DEPLOYMENT_CC_OPTS)
+SRC_LD_OPTS += $(MACOSX_DEPLOYMENT_LD_OPTS)
+
 C_PROG 	= hp2ps
 
 SRC_CC_OPTS += -I$(GHC_INCLUDE_DIR) -Wall
diff --git a/utils/hpc/Makefile b/utils/hpc/Makefile
index a59aa091fb..3b1d731050 100644
--- a/utils/hpc/Makefile
+++ b/utils/hpc/Makefile
@@ -1,6 +1,15 @@
 TOP=../..
 include $(TOP)/mk/boilerplate.mk
 
+# Beyond stage 1, honour any Mac OS X depolyment target options.  If we use 
+# these options in stage 1 we get a linker error if the bootstrap compiler is
+#  for a more recent OS version
+ifeq "$(stage)" "2"
+SRC_CC_OPTS += $(MACOSX_DEPLOYMENT_CC_OPTS)
+SRC_HC_OPTS += $(addprefix -optc, $(MACOSX_DEPLOYMENT_CC_OPTS))
+SRC_LD_OPTS += $(addprefix -optl, $(MACOSX_DEPLOYMENT_LD_OPTS))
+endif
+
 # We have two version: the inplace version compiled by the bootstrap compiler
 #   and the install version compiled by the stage 1 compiler
 ifeq "$(stage)" "2"
diff --git a/utils/hsc2hs/Makefile b/utils/hsc2hs/Makefile
index ca3fcd0220..7518841632 100644
--- a/utils/hsc2hs/Makefile
+++ b/utils/hsc2hs/Makefile
@@ -5,6 +5,15 @@
 TOP=../..
 include $(TOP)/mk/boilerplate.mk
 
+# Beyond stage 1, honour any Mac OS X depolyment target options.  If we use 
+# these options in stage 1 we get a linker error if the bootstrap compiler is
+#  for a more recent OS version
+ifeq "$(stage)" "2"
+SRC_CC_OPTS += $(MACOSX_DEPLOYMENT_CC_OPTS)
+SRC_HC_OPTS += $(addprefix -optc, $(MACOSX_DEPLOYMENT_CC_OPTS))
+SRC_LD_OPTS += $(addprefix -optl, $(MACOSX_DEPLOYMENT_LD_OPTS))
+endif
+
 # This causes libghccompat.a to be used:
 include $(GHC_COMPAT_DIR)/compat.mk
 
diff --git a/utils/lndir/Makefile b/utils/lndir/Makefile
index c8223df094..4334c0d535 100644
--- a/utils/lndir/Makefile
+++ b/utils/lndir/Makefile
@@ -1,6 +1,12 @@
 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
 
diff --git a/utils/prof/cgprof/Makefile b/utils/prof/cgprof/Makefile
index bac0ab7d21..acd71e9c54 100644
--- a/utils/prof/cgprof/Makefile
+++ b/utils/prof/cgprof/Makefile
@@ -1,6 +1,12 @@
 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_PROG = cgprof
 INSTALL_LIBEXECS=$(C_PROG)
 
diff --git a/utils/pwd/Makefile b/utils/pwd/Makefile
index c753ae889f..0935a64d1d 100644
--- a/utils/pwd/Makefile
+++ b/utils/pwd/Makefile
@@ -1,6 +1,15 @@
 TOP=../..
 include $(TOP)/mk/boilerplate.mk
 
+# Beyond stage 1, honour any Mac OS X depolyment target options.  If we use 
+# these options in stage 1 we get a linker error if the bootstrap compiler is
+#  for a more recent OS version
+ifeq "$(stage)" "2"
+SRC_CC_OPTS += $(MACOSX_DEPLOYMENT_CC_OPTS)
+SRC_HC_OPTS += $(addprefix -optc, $(MACOSX_DEPLOYMENT_CC_OPTS))
+SRC_LD_OPTS += $(addprefix -optl, $(MACOSX_DEPLOYMENT_LD_OPTS))
+endif
+
 # We have two version: the inplace version compiled by the bootstrap compiler
 #   and the install version compiled by the stage 1 compiler
 ifeq "$(stage)" "2"
diff --git a/utils/runghc/Makefile b/utils/runghc/Makefile
index 654ffad6dc..ef55c320a0 100644
--- a/utils/runghc/Makefile
+++ b/utils/runghc/Makefile
@@ -1,6 +1,15 @@
 TOP=../..
 include $(TOP)/mk/boilerplate.mk
 
+# Beyond stage 1, honour any Mac OS X depolyment target options.  If we use 
+# these options in stage 1 we get a linker error if the bootstrap compiler is
+#  for a more recent OS version
+ifeq "$(stage)" "2"
+SRC_CC_OPTS += $(MACOSX_DEPLOYMENT_CC_OPTS)
+SRC_HC_OPTS += $(addprefix -optc, $(MACOSX_DEPLOYMENT_CC_OPTS))
+SRC_LD_OPTS += $(addprefix -optl, $(MACOSX_DEPLOYMENT_LD_OPTS))
+endif
+
 # We have two version: the inplace version compiled by the bootstrap compiler
 #   and the install version compiled by the stage 1 compiler
 ifeq "$(stage)" "2"
diff --git a/utils/unlit/Makefile b/utils/unlit/Makefile
index dfa1b8db60..6323129511 100644
--- a/utils/unlit/Makefile
+++ b/utils/unlit/Makefile
@@ -1,6 +1,12 @@
 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=unlit.c
 C_PROG=unlit
 SRC_CC_OPTS += -O