projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Cleaned up version of Tom's unflattened skolemOccurs
[ghc-hetmet.git]
/
compiler
/
Makefile
diff --git
a/compiler/Makefile
b/compiler/Makefile
index
d0c68ab
..
f9a0b58
100644
(file)
--- a/
compiler/Makefile
+++ b/
compiler/Makefile
@@
-27,6
+27,7
@@
ifeq "$(GhcThreaded)$(GhcProfiled)" "YESYES"
$(error Cannot make GHC both threaded and profiled)
endif
$(error Cannot make GHC both threaded and profiled)
endif
+
#-----------------------------------------------------------------------------
# Counting source code lines
#-----------------------------------------------------------------------------
# Counting source code lines
@@
-89,6
+90,16
@@
ifeq "$(stage)" ""
stage=1
endif
stage=1
endif
+ifeq "$(HOSTPLATFORM)" "i386-unknown-mingw32"
+ifeq "$(stage)" "1"
+DQ = \"
+else
+DQ = \\\"
+endif
+else
+DQ = \"
+endif
+
.DUMMY: stage_dir
stage_dirs :
$(MKDIRHIER) stage$(stage)
.DUMMY: stage_dir
stage_dirs :
$(MKDIRHIER) stage$(stage)
@@
-154,6
+165,8
@@
odir=stage$(stage)
SRC_HC_OPTS += $(patsubst %, -i$(odir)/%, $(ALL_DIRS))
SRC_HC_OPTS += $(patsubst %, -i$(odir)/%, $(ALL_DIRS))
+SRC_HC_OPTS += -Wall -fno-warn-name-shadowing
+
HS_OBJS = $(patsubst %, $(odir)/%, $(addsuffix .$(way_)o,$(basename $(HS_SRCS))))
C_OBJS = $(patsubst %, $(odir)/%, $(addsuffix .$(way_)o,$(basename $(C_SRCS))))
HS_OBJS = $(patsubst %, $(odir)/%, $(addsuffix .$(way_)o,$(basename $(HS_SRCS))))
C_OBJS = $(patsubst %, $(odir)/%, $(addsuffix .$(way_)o,$(basename $(C_SRCS))))
@@
-207,6
+220,7
@@
boot :: $(CONFIG_HS)
$(CONFIG_HS) : $(FPTOOLS_TOP)/mk/config.mk
@$(RM) -f $(CONFIG_HS)
@echo "Creating $(CONFIG_HS) ... "
$(CONFIG_HS) : $(FPTOOLS_TOP)/mk/config.mk
@$(RM) -f $(CONFIG_HS)
@echo "Creating $(CONFIG_HS) ... "
+ @echo "{-# OPTIONS -w #-}" >>$(CONFIG_HS)
@echo "module Config where" >>$(CONFIG_HS)
@echo "cProjectName = \"$(ProjectName)\"" >> $(CONFIG_HS)
@echo "cProjectVersion = \"$(ProjectVersion)\"" >> $(CONFIG_HS)
@echo "module Config where" >>$(CONFIG_HS)
@echo "cProjectName = \"$(ProjectName)\"" >> $(CONFIG_HS)
@echo "cProjectVersion = \"$(ProjectVersion)\"" >> $(CONFIG_HS)
@@
-215,7
+229,11
@@
$(CONFIG_HS) : $(FPTOOLS_TOP)/mk/config.mk
@echo "cBooterVersion = \"$(GhcVersion)\"" >> $(CONFIG_HS)
@echo "cStage = STAGE" >> $(CONFIG_HS)
@echo "cHscIfaceFileVersion = \"$(HscIfaceFileVersion)\"" >> $(CONFIG_HS)
@echo "cBooterVersion = \"$(GhcVersion)\"" >> $(CONFIG_HS)
@echo "cStage = STAGE" >> $(CONFIG_HS)
@echo "cHscIfaceFileVersion = \"$(HscIfaceFileVersion)\"" >> $(CONFIG_HS)
+ @echo "cSplitObjs = \"$(SplitObjs)\"" >> $(CONFIG_HS)
+ @echo "cGhcWithInterpreter = \"$(GhcWithInterpreter)\"" >> $(CONFIG_HS)
@echo "cGhcWithNativeCodeGen = \"$(GhcWithNativeCodeGen)\"" >> $(CONFIG_HS)
@echo "cGhcWithNativeCodeGen = \"$(GhcWithNativeCodeGen)\"" >> $(CONFIG_HS)
+ @echo "cGhcWithSMP = \"$(GhcWithSMP)\"" >> $(CONFIG_HS)
+ @echo "cGhcRTSWays = \"$(GhcRTSWays)\"" >> $(CONFIG_HS)
@echo "cGhcUnregisterised = \"$(GhcUnregisterised)\"" >> $(CONFIG_HS)
@echo "cGhcEnableTablesNextToCode = \"$(GhcEnableTablesNextToCode)\"" >> $(CONFIG_HS)
@echo "cLeadingUnderscore = \"$(LeadingUnderscore)\"" >> $(CONFIG_HS)
@echo "cGhcUnregisterised = \"$(GhcUnregisterised)\"" >> $(CONFIG_HS)
@echo "cGhcEnableTablesNextToCode = \"$(GhcEnableTablesNextToCode)\"" >> $(CONFIG_HS)
@echo "cLeadingUnderscore = \"$(LeadingUnderscore)\"" >> $(CONFIG_HS)
@@
-247,6
+265,7
@@
endif
@echo "cUSER_WAY_NAMES = \"$(USER_WAY_NAMES)\"" >> $(CONFIG_HS)
@echo "cUSER_WAY_OPTS = \"$(USER_WAY_OPTS)\"" >> $(CONFIG_HS)
@echo "cDEFAULT_TMPDIR = \"$(DEFAULT_TMPDIR)\"" >> $(CONFIG_HS)
@echo "cUSER_WAY_NAMES = \"$(USER_WAY_NAMES)\"" >> $(CONFIG_HS)
@echo "cUSER_WAY_OPTS = \"$(USER_WAY_OPTS)\"" >> $(CONFIG_HS)
@echo "cDEFAULT_TMPDIR = \"$(DEFAULT_TMPDIR)\"" >> $(CONFIG_HS)
+ @echo "cDocDir = \"$(docdir)\"" >> $(CONFIG_HS)
@echo done.
CLEAN_FILES += $(CONFIG_HS)
@echo done.
CLEAN_FILES += $(CONFIG_HS)
@@
-715,14
+734,14
@@
SRC_LD_OPTS += -no-link-chk
INPLACE_PROG = $(odir)/ghc-inplace$(exeext)
EXCLUDED_C_SRCS += ghc-inplace.c
INPLACE_PROG = $(odir)/ghc-inplace$(exeext)
EXCLUDED_C_SRCS += ghc-inplace.c
-# FPTOOLS_TOP_ABS platform uses backslashes, at least on Cygwin, but that
-# will go wrong when we use it in a Haskell string below.
-TOP_ABS=$(subst \\,/,$(FPTOOLS_TOP_ABS_PLATFORM))
+GHC_PATH=$(FPTOOLS_TOP_ABS)/$(GHC_COMPILER_DIR_REL)/$(GHC_PROG)$(exeext)
-GHC_PATH=$(TOP_ABS)/$(GHC_COMPILER_DIR_REL)/$(GHC_PROG)
+ifeq "$(HOSTPLATFORM)" "i386-unknown-mingw32"
+INPLACE_EXTRA_FLAGS = -optc-DWINDOWS
+endif
$(INPLACE_PROG): ghc-inplace.c
$(INPLACE_PROG): ghc-inplace.c
- $(HC) -cpp -optc-DGHC_PATH=\"$(GHC_PATH)\" -optc-DTOP_ABS=\"$(TOP_ABS)\" $< -o $@
+ $(HC) -cpp -optc-DGHC_PATH=$(DQ)$(GHC_PATH)$(DQ) -optc-DTOP_ABS=$(DQ)$(FPTOOLS_TOP_ABS)$(DQ) $(INPLACE_EXTRA_FLAGS) $< -o $@
all :: $(INPLACE_PROG)
all :: $(INPLACE_PROG)
@@
-793,7
+812,7
@@
endif
# typecheck/TcType_HC_OPTS += -auto-all
# typecheck/TcUnify_HC_OPTS += -auto-all
# typecheck/TcType_HC_OPTS += -auto-all
# typecheck/TcUnify_HC_OPTS += -auto-all
-coreSyn/CorePrep_HC_OPTS += -auto-all
+# coreSyn/CorePrep_HC_OPTS += -auto-all
# parser/Parser_HC_OPTS += -fasm
#-----------------------------------------------------------------------------
# parser/Parser_HC_OPTS += -fasm
#-----------------------------------------------------------------------------
@@
-836,7
+855,7
@@
GhcLibHcOpts =
HS_IFACES = $(addsuffix .$(way_)hi,$(basename $(HS_OBJS)))
# Haddock can't handle recursive modules currently, so we disable it for now.
HS_IFACES = $(addsuffix .$(way_)hi,$(basename $(HS_OBJS)))
# Haddock can't handle recursive modules currently, so we disable it for now.
-HADDOCK_DOCS = NO
+override HADDOCK_DOCS = NO
# Tell package.mk not to set $(HC)
NO_SET_HC = YES
# Tell package.mk not to set $(HC)
NO_SET_HC = YES
@@
-910,7
+929,7
@@
all :: $(GHC_PROG)
endif
endif
endif
endif
-$(odir)/main/Config.$(way_)o: SRC_HC_OPTS+=-DSTAGE='"$(stage)"'
+$(odir)/main/Config.$(way_)o: SRC_HC_OPTS+=-DSTAGE=$(DQ)$(stage)$(DQ)
#-----------------------------------------------------------------------------
# binary-dist
#-----------------------------------------------------------------------------
# binary-dist