Fix scoped type variables for expression type signatures

[ghc-hetmet.git] / compiler / Makefile.ghcbin

diff --git a/compiler/Makefile.ghcbin b/compiler/Makefile.ghcbin
index 626ec51..41f0858 100644 (file)
--- a/compiler/Makefile.ghcbin
+++ b/compiler/Makefile.ghcbin
@@ -13,11 +13,20 @@ stage=2
 
 HC=$(GHC_STAGE1)
 SRC_HC_OPTS += -package ghc
-SRC_HC_OPTS += -DGHCI -DBREAKPOINT
 SRC_HC_OPTS += -Istage$(stage)
 SRC_HC_OPTS += \
   -cpp -fglasgow-exts -fno-generics -Rghc-timing \
   -I. -IcodeGen -InativeGen -Iparser
+SRC_HC_OPTS += $(GhcHcOpts) $(GhcStage$(stage)HcOpts)
+ifeq "$(TargetOS_CPP)" "openbsd"
+SRC_HC_OPTS += -optl-Xlinker -optl-E
+endif
+
+ifeq "$(GhcWithInterpreter)" "YES"
+SRC_HC_OPTS += -DGHCI -DBREAKPOINT
+endif
+
+SRC_HC_OPTS += -threaded
 
 odir=stage$(stage)
 
@@ -26,5 +35,3 @@ HS_OBJS = $(patsubst %, $(odir)/%, $(addsuffix .$(way_)o,$(basename $(HS_SRCS)))
 $(odir)/main/Main.o : libHSghc$(_way).a
 
 include $(TOP)/mk/target.mk
-
--include .depend-$(stage)