diff options
| author | Ian Lynagh <ian@well-typed.com> | 2013-03-03 20:27:51 +0000 |
|---|---|---|
| committer | Ian Lynagh <ian@well-typed.com> | 2013-03-03 20:27:51 +0000 |
| commit | 1cb4b90334c17ea86606ef37ff6e0461ea56396a (patch) | |
| tree | b1feba1202f4c66f389944ccc557426459b9528d | |
| parent | 480ad0369c51879060f56fe77003e10e4da6b141 (diff) | |
| download | haskell-1cb4b90334c17ea86606ef37ff6e0461ea56396a.tar.gz | |
Use unlit_INPLACE rather than UNLIT in the build system
| -rw-r--r-- | compiler/ghc.mk | 2 | ||||
| -rw-r--r-- | ghc/ghc.mk | 2 | ||||
| -rw-r--r-- | mk/config.mk.in | 2 | ||||
| -rw-r--r-- | rules/build-perl.mk | 4 | ||||
| -rw-r--r-- | utils/unlit/ghc.mk | 2 |
5 files changed, 5 insertions, 7 deletions
diff --git a/compiler/ghc.mk b/compiler/ghc.mk index 0cceed03cb..a27208bf22 100644 --- a/compiler/ghc.mk +++ b/compiler/ghc.mk @@ -102,7 +102,7 @@ endif @echo 'cRAWCPP_FLAGS :: String' >> $@ @echo 'cRAWCPP_FLAGS = "$(RAWCPP_FLAGS)"' >> $@ @echo 'cGHC_UNLIT_PGM :: String' >> $@ - @echo 'cGHC_UNLIT_PGM = "$(GHC_UNLIT_PGM)"' >> $@ + @echo 'cGHC_UNLIT_PGM = "$(utils/unlit_dist_PROG)"' >> $@ @echo 'cGHC_SPLIT_PGM :: String' >> $@ @echo 'cGHC_SPLIT_PGM = "$(GHC_SPLIT_PGM)"' >> $@ @echo 'cLibFFI :: Bool' >> $@ diff --git a/ghc/ghc.mk b/ghc/ghc.mk index 13a3e544b1..73d025369c 100644 --- a/ghc/ghc.mk +++ b/ghc/ghc.mk @@ -141,7 +141,7 @@ $(INPLACE_LIB)/platformConstants: $(includes_GHCCONSTANTS_HASKELL_VALUE) # The GHC programs need to depend on all the helper programs they might call, # and the settings files they use -GHC_DEPENDENCIES += $(UNLIT) +GHC_DEPENDENCIES += $$(unlit_INPLACE) GHC_DEPENDENCIES += $(INPLACE_LIB)/settings GHC_DEPENDENCIES += $(INPLACE_LIB)/platformConstants diff --git a/mk/config.mk.in b/mk/config.mk.in index 1488a5a4f9..69bb2b88bb 100644 --- a/mk/config.mk.in +++ b/mk/config.mk.in @@ -434,11 +434,9 @@ SRC_FLEX_OPTS += -8 # xxx_PGM the name of an executable, without the path # xxx the executable relative to the current dir -GHC_UNLIT_PGM = unlit$(exeext) GHC_SPLIT_PGM = ghc-split SPLIT = $(INPLACE_LIB)/$(GHC_SPLIT_PGM) -UNLIT = $(INPLACE_LIB)/$(GHC_UNLIT_PGM) TOUCHY = $(INPLACE_LIB)/touchy$(exeext) MKDIRHIER = $(INPLACE_BIN)/mkdirhier diff --git a/rules/build-perl.mk b/rules/build-perl.mk index b39134f05f..74c05b5b7f 100644 --- a/rules/build-perl.mk +++ b/rules/build-perl.mk @@ -39,8 +39,8 @@ clean_$1 : clean_$1_$2 # INPLACE_BIN etc. might be empty if we're cleaning ifeq "$(findstring clean,$(MAKECMDGOALS))" "" ifneq "$$(BINDIST)" "YES" -$1/$2/$$($1_$2_PROG).prl: $1/$$($1_PERL_SRC) $$(UNLIT) | $$$$(dir $$$$@)/. - "$$(UNLIT)" $$(UNLIT_OPTS) $$< $$@ +$1/$2/$$($1_$2_PROG).prl: $1/$$($1_PERL_SRC) $$$$(unlit_INPLACE) | $$$$(dir $$$$@)/. + "$$(unlit_INPLACE)" $$(UNLIT_OPTS) $$< $$@ endif $1/$2/$$($1_$2_PROG): $1/$2/$$($1_$2_PROG).prl diff --git a/utils/unlit/ghc.mk b/utils/unlit/ghc.mk index 1bdf4a07b6..597a9018c2 100644 --- a/utils/unlit/ghc.mk +++ b/utils/unlit/ghc.mk @@ -11,7 +11,7 @@ # ----------------------------------------------------------------------------- utils/unlit_dist_C_SRCS = unlit.c -utils/unlit_dist_PROG = $(GHC_UNLIT_PGM) +utils/unlit_dist_PROG = unlit$(exeext) utils/unlit_dist_TOPDIR = YES utils/unlit_dist_INSTALL = YES utils/unlit_dist_INSTALL_INPLACE = YES |