[commit: ghc] master: Remove some more unused build system variables (116e5d2)

Ian Lynagh igloo at earth.li
Sat Mar 2 01:53:04 CET 2013


Repository : http://darcs.haskell.org/ghc.git/

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/116e5d2c617e7b48b65d9b28ceb7241fd4a258a6

>---------------------------------------------------------------

commit 116e5d2c617e7b48b65d9b28ceb7241fd4a258a6
Author: Ian Lynagh <ian at well-typed.com>
Date:   Fri Mar 1 23:45:30 2013 +0000

    Remove some more unused build system variables

>---------------------------------------------------------------

 mk/config.mk.in | 24 ------------------------
 mk/tree.mk      |  2 --
 2 files changed, 26 deletions(-)

diff --git a/mk/config.mk.in b/mk/config.mk.in
index bfc811c..c3bb005 100644
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -433,9 +433,6 @@ SRC_HC_OPTS += -H32m -O
 # These flags make flex 8-bit
 SRC_FLEX_OPTS	+= -8
 
-# Flags for CPP when running GreenCard on .pgc files
-GC_CPP_OPTS += -P -E -x c -traditional -D__GLASGOW_HASKELL__
-
 
 # -----------------------------------------------------------------------------
 # Names of programs in the GHC tree
@@ -444,8 +441,6 @@ GC_CPP_OPTS += -P -E -x c -traditional -D__GLASGOW_HASKELL__
 #      xxx              the executable relative to the current dir
 
 GHC_UNLIT_PGM           = unlit$(exeext)
-GHC_HP2PS_PGM           = hp2ps$(exeext)
-GHC_GHCTAGS_PGM         = ghctags$(exeext)
 GHC_HSC2HS_PGM          = hsc2hs$(exeext)
 GHC_TOUCHY_PGM          = touchy$(exeext)
 GHC_SPLIT_PGM           = ghc-split
@@ -454,23 +449,10 @@ GHC_GENPRIMOP_PGM       = genprimopcode$(exeext)
 GHC_GENAPPLY_PGM        = genapply$(exeext)
 GHC_CABAL_PGM           = ghc-cabal$(exeext)
 GHC_PKG_PGM             = ghc-pkg$(exeext)
-GHC_LTX_PGM             = ltx$(exeext)
 GHC_MKDIRHIER_PGM       = mkdirhier
-GHC_LNDIR_PGM           = lndir
-
-ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
-GHC_CP			= "xcopy /y"
-GHC_PERL		= perl
-else
-GHC_CP			= $(CP)
-GHC_PERL		= $(PERL)
-endif
 
-HP2PS			= $(GHC_HP2PS_DIR)/$(GHC_HP2PS_PGM)
 SPLIT			= $(INPLACE_LIB)/$(GHC_SPLIT_PGM)
 SYSMAN 			= $(GHC_SYSMAN_DIR)/$(GHC_SYSMAN_PGM)
-LTX 			= $(GHC_LTX_DIR)/$(GHC_LTX_PGM)
-LNDIR			= $(GHC_LNDIR_DIR)/$(GHC_LNDIR_PGM)
 
 UNLIT			= $(INPLACE_LIB)/$(GHC_UNLIT_PGM)
 TOUCHY                  = $(INPLACE_LIB)/$(GHC_TOUCHY_PGM)
@@ -478,7 +460,6 @@ 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)
-GHCTAGS_INPLACE		= $(INPLACE_BIN)/$(GHC_GHCTAGS_PGM)
 HSC2HS_INPLACE		= $(INPLACE_BIN)/$(GHC_HSC2HS_PGM)
 GENPRIMOP_INPLACE	= $(INPLACE_BIN)/$(GHC_GENPRIMOP_PGM)
 
@@ -689,17 +670,12 @@ FIND			= @FindCmd@
 INSTALL			= @INSTALL@
 INSTALL			:= $(subst .././install-sh,$(TOP)/install-sh,$(INSTALL))
 
-LATEX			= latex
-PDFLATEX                = pdflatex
-BIBTEX                  = bibtex
 LN_S			= @LN_S@
 MV			= mv
-NROFF			= nroff
 PERL 			= @PerlCmd@
 PIC			= pic
 RANLIB			= @RANLIB@
 SED			= @SedCmd@
-TR 			= tr
 SHELL			= /bin/sh
 
 HaveDtrace		= @HaveDtrace@
diff --git a/mk/tree.mk b/mk/tree.mk
index f23783d..4e67aa3 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_LTX_DIR             = $(GHC_UTILS_DIR)/ltx
-GHC_LNDIR_DIR           = $(GHC_UTILS_DIR)/lndir
 GHC_MKDIRHIER_DIR       = $(GHC_UTILS_DIR)/mkdirhier
 GHC_UNLIT_DIR           = $(GHC_UTILS_DIR)/unlit
 GHC_HP2PS_DIR           = $(GHC_UTILS_DIR)/hp2ps





More information about the ghc-commits mailing list