diff options
| author | Ian Lynagh <ian@well-typed.com> | 2013-03-03 18:49:23 +0000 |
|---|---|---|
| committer | Ian Lynagh <ian@well-typed.com> | 2013-03-03 19:56:49 +0000 |
| commit | 1da6975add0b333027f2b643933a4b60f0f66095 (patch) | |
| tree | b0fb41e1be3d37acec65c2920e7555df804817d8 /mk | |
| parent | 5d0801dac3503c242e874eb6334245943b2e7908 (diff) | |
| download | haskell-1da6975add0b333027f2b643933a4b60f0f66095.tar.gz | |
Define $(prog)_INPLACE variables automatically, and start using them
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/config.mk.in | 18 | ||||
| -rw-r--r-- | mk/tree.mk | 2 |
2 files changed, 4 insertions, 16 deletions
diff --git a/mk/config.mk.in b/mk/config.mk.in index b310e86e98..c43612f709 100644 --- a/mk/config.mk.in +++ b/mk/config.mk.in @@ -435,24 +435,14 @@ SRC_FLEX_OPTS += -8 # xxx the executable relative to the current dir GHC_UNLIT_PGM = unlit$(exeext) -GHC_HSC2HS_PGM = hsc2hs$(exeext) -GHC_TOUCHY_PGM = touchy$(exeext) GHC_SPLIT_PGM = ghc-split -GHC_GENPRIMOP_PGM = genprimopcode$(exeext) -GHC_GENAPPLY_PGM = genapply$(exeext) -GHC_CABAL_PGM = ghc-cabal$(exeext) -GHC_PKG_PGM = ghc-pkg$(exeext) -GHC_MKDIRHIER_PGM = mkdirhier SPLIT = $(INPLACE_LIB)/$(GHC_SPLIT_PGM) UNLIT = $(INPLACE_LIB)/$(GHC_UNLIT_PGM) -TOUCHY = $(INPLACE_LIB)/$(GHC_TOUCHY_PGM) -MKDIRHIER = $(INPLACE_BIN)/$(GHC_MKDIRHIER_PGM) -GHC_CABAL_INPLACE = $(INPLACE_BIN)/$(GHC_CABAL_PGM) -GENAPPLY_INPLACE = $(INPLACE_BIN)/$(GHC_GENAPPLY_PGM) -GHC_PKG_INPLACE = $(INPLACE_BIN)/$(GHC_PKG_PGM) -HSC2HS_INPLACE = $(INPLACE_BIN)/$(GHC_HSC2HS_PGM) -GENPRIMOP_INPLACE = $(INPLACE_BIN)/$(GHC_GENPRIMOP_PGM) +TOUCHY = $(INPLACE_LIB)/touchy$(exeext) +MKDIRHIER = $(INPLACE_BIN)/mkdirhier +GHC_CABAL_INPLACE = $(INPLACE_BIN)/ghc-cabal$(exeext) +GHC_PKG_INPLACE = $(INPLACE_BIN)/ghc-pkg$(exeext) GENERATED_FILE = chmod a-w EXECUTABLE_FILE = chmod +x diff --git a/mk/tree.mk b/mk/tree.mk index 1ae45ed2cf..9c2e3daa4e 100644 --- a/mk/tree.mk +++ b/mk/tree.mk @@ -20,8 +20,6 @@ GHC_INCLUDE_DIRS = includes includes/dist includes/dist-derivedconstants/ GHC_RTS_DIR = rts GHC_DRIVER_DIR = driver -GHC_CABAL_DIR = $(GHC_UTILS_DIR)/ghc-cabal - INPLACE = inplace INPLACE_BIN = $(INPLACE)/bin INPLACE_LIB = $(INPLACE)/lib |