X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2FMakefile;h=7cd21c627c04eab8a0514b006416201daa22709a;hb=11a4f9a91213e98c586feeb64c41c0e07037df66;hp=cdc8b3c3e445a61201fc8c7a7a63360475e4491f;hpb=5b846fa36eee0f96c4c47128706d0131f8bb4113;p=ghc-hetmet.git diff --git a/compiler/Makefile b/compiler/Makefile index cdc8b3c..7cd21c6 100644 --- a/compiler/Makefile +++ b/compiler/Makefile @@ -433,7 +433,7 @@ SRC_HC_OPTS += -Istage$(stage) ALL_DIRS = \ utils basicTypes types hsSyn prelude rename typecheck deSugar coreSyn \ vectorise specialise simplCore stranal stgSyn simplStg codeGen main \ - profiling parser cprAnalysis ndpFlatten iface cmm + profiling parser cprAnalysis iface cmm # Make sure we include Config.hs even if it doesn't exist yet... ALL_SRCS += $(CONFIG_HS) @@ -881,6 +881,8 @@ LIB_LD_OPTS += $(foreach pkg,$(PKG_DEPENDS),-package $(pkg)) # We have to expand each package dependency with its version, which we # can do by calling "ghc-pkg list $pkg --simple-output". PACKAGE_CPP_OPTS += -DPKG_DEPENDS='$(foreach pkg,$(PKG_DEPENDS),$(shell $(GHC_PKG_INPLACE) latest --global $(pkg)))' +# We want to define STAGE to be like "2" in the Haskell code, so we need +# to quote the "s so that they don't get interpreted by the shell. PACKAGE_CPP_OPTS += -DSTAGE='"$(stage)"' # Omit Main from the library, the client will want to plug their own Main in