X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2FMakefile.ghcbin;h=379a725a283843cc92cbb5fc2bd8fe250c6f638c;hb=e761a777f2440ca1b8d8b40848cc5aa30d889ff6;hp=0f91a535569be992e485a71ab46cf80979e73a10;hpb=7ef63167c88c64927d55823ec31801212ea92413;p=ghc-hetmet.git diff --git a/compiler/Makefile.ghcbin b/compiler/Makefile.ghcbin index 0f91a53..379a725 100644 --- a/compiler/Makefile.ghcbin +++ b/compiler/Makefile.ghcbin @@ -17,10 +17,13 @@ ifeq "$(stage)" "3" HC=$(GHC_STAGE2) endif +EXCLUDED_C_SRCS += ghc-inplace.c + +SRC_HC_OPTS += -Wall SRC_HC_OPTS += -package ghc SRC_HC_OPTS += -Istage$(stage) SRC_HC_OPTS += \ - -cpp -fglasgow-exts -fno-generics -Rghc-timing \ + -cpp -fglasgow-exts -XNoGenerics -Rghc-timing \ -I. -IcodeGen -InativeGen -Iparser SRC_HC_OPTS += $(GhcHcOpts) $(GhcStage$(stage)HcOpts) ifeq "$(TargetOS_CPP)" "openbsd" @@ -37,9 +40,15 @@ endif endif -ifneq "$(GhcNotThreaded)" "YES" +ifeq "$(GhcThreaded)" "YES" SRC_HC_OPTS += -threaded endif +ifeq "$(GhcProfiled)" "YES" +SRC_HC_OPTS += -prof +endif +ifeq "$(GhcDebugged)" "YES" +SRC_LD_OPTS += -debug +endif odir=stage$(stage) @@ -47,4 +56,6 @@ HS_SRCS = main/Main.hs HS_OBJS = $(patsubst %, $(odir)/%, $(addsuffix .$(way_)o,$(basename $(HS_SRCS)))) $(odir)/main/Main.o : libHSghc$(_way).a +WAYS=$(GhcCompilerWays) + include $(TOP)/mk/target.mk