Commit 1cb4b903 authored by ian@well-typed.com's avatar ian@well-typed.com

Use unlit_INPLACE rather than UNLIT in the build system

parent 480ad036
......@@ -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' >> $@
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment