X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=mk%2Fopts.mk;h=fe2d06066b9f45f6ce7f0aa71221f40a6019b0ca;hp=46ed7d8b3f380bb54fe2f39a4afb8b4d19b6d898;hb=fd1375dd261725eb00969a3017b924369c09835c;hpb=27e96f5e37d3b1fbb4025ae51c964f2cdcb9f0e3 diff --git a/mk/opts.mk b/mk/opts.mk index 46ed7d8..fe2d060 100644 --- a/mk/opts.mk +++ b/mk/opts.mk @@ -5,7 +5,7 @@ # This file defines Make variables for the # option flags for each utility program # -# $Id: opts.mk,v 1.23 2001/05/18 09:14:20 simonmar Exp $ +# $Id: opts.mk,v 1.36 2004/08/26 20:08:54 panne Exp $ # ################################################################################# @@ -17,8 +17,8 @@ # # AR AS CPP CTAGS C FLEX HC HSTAGS LD LINT # LIT2CHANGELOG LIT2HTML LIT2LATEX LIT2PGM -# MKDEPENDC MKDEPENDHS MKDEPENDLIT MSUB -# RUNTEST UGEN UNLIT YACC +# MKDEPENDC MKDEPENDHS MKDEPENDLIT RUNTEST +# UNLIT # For each such utility program P, this file defines @@ -39,34 +39,17 @@ # # and for some programs # +# $(HcFlavour)_P_OPTS Compiler-specific options for P # $($*_P_OPTS) Target specific options for P # # All these options should be set with # thing += extra-options # in case someone higher up the include hierarchy has already added some - -################################################################################# -# -# Global option flags for utilities -# -################################################################################# - -# These flags make flex 8-bit -SRC_FLEX_OPTS += -8 - -SRC_INSTALL_BIN_OPTS += -s - -# lint gets all CPP's flags too -SRC_LINT_OPTS += -axz -DLINT $(SRC_CPP_OPTS) -WAY$(_way)_LINT_OPTS += WAY$(_way)_CPP_OPTS - -# Default fptools options for dllwrap. -SRC_BLD_DLL_OPTS += -mno-cygwin -mwin32 --target=i386-mingw32 - -# Flags for CPP when running GreenCard on .pgc files -GC_CPP_OPTS += -P -E -x c -traditional -D__GLASGOW_HASKELL__ - +# Which class of compiler are we aiming at? (GHC, NHC or HUGS) +ifeq "$(HcFlavour)" "" +HcFlavour = GHC +endif ################################################################################# # @@ -81,23 +64,25 @@ HC_OPTS = $(SRC_HC_OPTS) $(WAY$(_way)_HC_OPTS) $($*_HC_OPTS) $(EXTRA_ HC_POST_OPTS = $(SRC_HC_POST_OPTS) $(WAY$(_way)_HC_POST_OPTS) $($*_HC_POST_OPTS) $(EXTRA_HC_POST_OPTS) HC_PRE_OPTS = $(SRC_HC_PRE_OPTS) $(WAY$(_way)_HC_PRE_OPTS) $($*_HC_PRE_OPTS) $(EXTRA_HC_PRE_OPTS) +ILX2IL_OPTS = $(SRC_ILX2IL_OPTS) $(WAY$(_way)_ILX2IL_OPTS) $($*_ILX2IL_OPTS) $(EXTRA_ILX2IL_OPTS) +ILASM_OPTS = $(SRC_ILASM_OPTS) $(WAY$(_way)_ILASM_OPTS) $($*_ILASM_OPTS) $(EXTRA_ILASM_OPTS) + RUNTEST_OPTS = $(SRC_RUNTEST_OPTS) $(WAY$(_way)_RUNTEST_OPTS) \ $($*_RUNTEST_OPTS) $(EXTRA_RUNTEST_OPTS) +ALEX_OPTS = $(SRC_ALEX_OPTS) $($(HcFlavour)_ALEX_OPTS) $(WAY$(_way)_ALEX_OPTS) $($*_ALEX_OPTS) $(EXTRA_ALEX_OPTS) AR_OPTS = $(SRC_AR_OPTS) $(WAY$(_way)_AR_OPTS) $(EXTRA_AR_OPTS) AS_OPTS = $(SRC_AS_OPTS) $(WAY$(_way)_AS_OPTS) $(EXTRA_AS_OPTS) BLD_DLL_OPTS = $(SRC_BLD_DLL_OPTS) $(WAY$(_way)_BLD_DLL_OPTS) $($*_HC_OPTS) $(EXTRA_BLD_DLL_OPTS) CPP_OPTS = $(SRC_CPP_OPTS) $(WAY$(_way)_CPP_OPTS) $(EXTRA_CPP_OPTS) CTAGS_OPTS = $(SRC_CTAGS_OPTS) $(WAY$(_way)_CTAGS_OPTS) $(EXTRA_CTAGS_OPTS) CC_OPTS = $(SRC_CC_OPTS) $(WAY$(_way)_CC_OPTS) $($*_CC_OPTS) $(EXTRA_CC_OPTS) -ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32" -CC_OPTS += -mno-cygwin -mwin32 -endif FLEX_OPTS = $(SRC_FLEX_OPTS) $(WAY$(_way)_FLEX_OPTS) $(EXTRA_FLEX_OPTS) -HAPPY_OPTS = $(SRC_HAPPY_OPTS) $(WAY$(_way)_HAPPY_OPTS) $($*_HAPPY_OPTS) $(EXTRA_HAPPY_OPTS) +HADDOCK_OPTS = $(SRC_HADDOCK_OPTS) $(WAY$(_way)_HADDOCK_OPTS) $($*_HADDOCK_OPTS) $(EXTRA_HADDOCK_OPTS) +HAPPY_OPTS = $(SRC_HAPPY_OPTS) $($(HcFlavour)_HAPPY_OPTS) $(WAY$(_way)_HAPPY_OPTS) $($*_HAPPY_OPTS) $(EXTRA_HAPPY_OPTS) GC_OPTS = $(SRC_GC_OPTS) $(WAY$(_way)_GC_OPTS) $($*_GC_OPTS) $(EXTRA_GC_OPTS) HSTAGS_OPTS = $(SRC_HSTAGS_OPTS) $(WAY$(_way)_HSTAGS_OPTS) $(EXTRA_HSTAGS_OPTS) -HSC2HS_OPTS = $(SRC_HSC2HS_OPTS) $(WAY$(_way)_HSC2HS_OPTS) $(EXTRA_HSC2HS_OPTS) +HSC2HS_OPTS = $(SRC_HSC2HS_OPTS) $($(HcFlavour)_HSC2HS_OPTS) $(WAY$(_way)_HSC2HS_OPTS) $(EXTRA_HSC2HS_OPTS) INSTALL_OPTS = $(SRC_INSTALL_OPTS) $(WAY$(_way)_INSTALL_OPTS) $(EXTRA_INSTALL_OPTS) INSTALL_BIN_OPTS = $(INSTALL_OPTS) $(SRC_INSTALL_BIN_OPTS) LD_OPTS = $(SRC_LD_OPTS) $(WAY$(_way)_LD_OPTS) $(EXTRA_LD_OPTS) @@ -114,12 +99,10 @@ MKDEPENDHS_OPTS = $(SRC_MKDEPENDHS_OPTS) $(WAY$(_way)_MKDEPENDHS_OPTS) \ $(EXTRA_MKDEPENDHS_OPTS) MKDEPENDLIT_OPTS = $(SRC_MKDEPENDLIT_OPTS) $(WAY$(_way)_MKDEPENDLIT_OPTS) \ $(EXTRA_MKDEPENDLIT_OPTS) -SGML2DVI_OPTS = $(SRC_SGML2DVI_OPTS) $(WAY$(_way)_SGML2DVI_OPTS) $(EXTRA_SGML2DVI_OPTS) -SGML2PS_OPTS = $(SRC_SGML2PS_OPTS) $(WAY$(_way)_SGML2PS_OPTS) $(EXTRA_SGML2PS_OPTS) -SGML2PDF_OPTS = $(SRC_SGML2PDF_OPTS) $(WAY$(_way)_SGML2PDF_OPTS) $(EXTRA_SGML2PDF_OPTS) -SGML2RTF_OPTS = $(SRC_SGML2RTF_OPTS) $(WAY$(_way)_SGML2RTF_OPTS) $(EXTRA_SGML2RTF_OPTS) -SGML2HTML_OPTS = $(SRC_SGML2HTML_OPTS) $(WAY$(_way)_SGML2HTML_OPTS) $(EXTRA_SGML2HTML_OPTS) -UGEN_OPTS = $(SRC_UGEN_OPTS) $(WAY$(_way)_UGEN_OPTS) $(EXTRA_UGEN_OPTS) +XSLTPROC_OPTS = $(WAY$(_way)_XSLTPROC_OPTS) $(EXTRA_XSLTPROC_OPTS) +FOP_OPTS = $(WAY$(_way)_FOP_OPTS) $(EXTRA_FOP_OPTS) UNLIT_OPTS = $(SRC_UNLIT_OPTS) $(WAY$(_way)_UNLIT_OPTS) $(EXTRA_UNLIT_OPTS) -YACC_OPTS = $(SRC_YACC_OPTS) $(WAY$(_way)_YACC_OPTS) $(EXTRA_YACC_OPTS) ZIP_OPTS = $(SRC_ZIP_OPTS) $(EXTRA_ZIP_OPTS) + +# Version of CC_OPTS to use when GHC is the C compiler +GHC_CC_OPTS = $(addprefix -optc, $(CC_OPTS)) $(HC_OPTS)