Mac OS X deployment target: piping opts through Makefiles

[ghc-hetmet.git] / libraries / Makefile

diff --git a/libraries/Makefile b/libraries/Makefile
index 9bd393b..5af0f7e 100644 (file)
--- a/libraries/Makefile
+++ b/libraries/Makefile
@@ -143,6 +143,8 @@ BOOTSTRAP_LIBS = Cabal filepath
 BOOTSTRAP_STAMPS = $(addprefix stamp/bootstrapping.,$(BOOTSTRAP_LIBS))
 BOOTSTRAP_INC_1_UP = -DCABAL_VERSION=1,3 $(addprefix -i../bootstrapping.,$(BOOTSTRAP_LIBS))
 BOOTSTRAP_INC_2_UP = -DCABAL_VERSION=1,3 $(addprefix -i../../bootstrapping.,$(BOOTSTRAP_LIBS))
+DEPLOYMENT_OPTS = $(addprefix -optc, $(MACOSX_DEPLOYMENT_CC_OPTS)) \
+                 $(addprefix -optl, $(MACOSX_DEPLOYMENT_LD_OPTS))
 
 .PHONY: subdirs
 
@@ -173,10 +175,10 @@ installPackage/installPackage: installPackage.hs $(BOOTSTRAP_STAMPS)
        -$(RM) -rf installPackage
        mkdir installPackage
        $(CP) installPackage.hs installPackage/
-ifeq "$(UseStage1)" "YES"
+ifeq "$(stage)" "2"
        cd installPackage && ../$(HC) -Wall -cpp \
                                    --make installPackage -o installPackage \
-                                   $(BOOTSTRAP_INC_1_UP)
+                                   $(BOOTSTRAP_INC_1_UP) $(DEPLOYMENT_OPTS)
 else
        cd installPackage && $(GHC) -Wall -cpp \
                                    --make installPackage -o installPackage \
@@ -190,8 +192,9 @@ ifBuildable/ifBuildable: ifBuildable.hs
        -$(RM) -rf ifBuildable
        mkdir ifBuildable
        $(CP) ifBuildable.hs ifBuildable/
-ifeq "$(UseStage1)" "YES"
-       cd ifBuildable && ../$(HC) -Wall --make ifBuildable -o ifBuildable
+ifeq "$(stage)" "2"
+       cd ifBuildable && ../$(HC) -Wall --make ifBuildable -o ifBuildable \
+                                $(DEPLOYMENT_OPTS)
 else
        cd ifBuildable && $(GHC) -Wall --make ifBuildable -o ifBuildable
 endif
@@ -275,7 +278,7 @@ stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).%: %/setup/Setup
 # every time.
 $(foreach SUBDIR,$(SUBDIRS),make.library.$(SUBDIR)):\
 make.library.%: stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).% \
-                %/setup/Setup ifBuildable/ifBuildable
+                %/setup/Setup ifBuildable/ifBuildable installPackage/installPackage
        if ifBuildable/ifBuildable $*; then \
          cd $* && \
          cmp -s ../Makefile.local Makefile.local || cp ../Makefile.local .; \