# be to do `env PATH=$(PATH) make ghc' to minimise the environment. (or the
# equivalent of `env' if it doesn't exist locally).
#
+ifneq "$(BuildPackageGHC)" "YES"
ifneq "$(way)" "dll"
ifneq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
HS_PROG=$(odir)/ghc$(_way)-$(ProjectVersion)
else
HS_PROG=$(odir)/ghc-$(ProjectVersion)
endif
+endif
# -----------------------------------------------------------------------------
# Create compiler configuration
@echo "cHscIfaceFileVersion = \"$(HscIfaceFileVersion)\"" >> $(CONFIG_HS)
@echo "cHOSTPLATFORM = \"$(HOSTPLATFORM)\"" >> $(CONFIG_HS)
@echo "cTARGETPLATFORM = \"$(TARGETPLATFORM)\"" >> $(CONFIG_HS)
+ @echo "cTARGETOS = \"$(TargetOS_CPP)\"" >> $(CONFIG_HS)
+ @echo "cTARGETARCH = \"$(TargetArch_CPP)\"" >> $(CONFIG_HS)
@echo "cGhcWithNativeCodeGen = \"$(GhcWithNativeCodeGen)\"" >> $(CONFIG_HS)
@echo "cGhcUnregisterised = \"$(GhcUnregisterised)\"" >> $(CONFIG_HS)
@echo "cLeadingUnderscore = \"$(LeadingUnderscore)\"" >> $(CONFIG_HS)
endif
@echo "cEnableWin32DLLs = \"$(EnableWin32DLLs)\"" >> $(CONFIG_HS)
@echo "cCONTEXT_DIFF = \"$(CONTEXT_DIFF)\"" >> $(CONFIG_HS)
- @echo "cHaveLibGmp = \"$(HaveLibGmp)\"" >> $(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)
ALL_DIRS = \
utils basicTypes types hsSyn prelude rename typecheck deSugar coreSyn \
- specialise simplCore stranal stgSyn simplStg codeGen absCSyn main \
- profiling parser cprAnalysis compMan ndpFlatten cbits iface
+ specialise simplCore stranal stgSyn simplStg codeGen main \
+ profiling parser cprAnalysis compMan ndpFlatten cbits iface cmm
# Make sure we include Config.hs even if it doesn't exist yet...
ALL_SRCS += $(CONFIG_HS)
# Only include GHCi if we're bootstrapping with at least version 411
ifeq "$(GhcWithInterpreter) $(bootstrapped)" "YES YES"
-# Yes, include the interepreter, readline, and Template Haskell extensions
-SRC_HC_OPTS += -DGHCI -package haskell-src
+# Yes, include the interpreter, readline, and Template Haskell extensions
+SRC_HC_OPTS += -DGHCI -package template-haskell
ifneq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
SRC_HC_OPTS += -package unix
ifeq "$(GhcLibsWithReadline)" "YES"
EXCLUDED_SRCS += deSugar/DsMeta.hs typecheck/TcSplice.lhs hsSyn/Convert.lhs
endif
-# There are some C files to include in HS_PROG, so add these to HS_OBJS
-HS_OBJS += $(C_OBJS)
-
# -----------------------------------------------
# mkdependC stuff
#
# Haskell compilations
SRC_HC_OPTS += \
- -cpp -fglasgow-exts -Rghc-timing \
+ -cpp -fglasgow-exts -fno-generics -Rghc-timing \
-I. -IcodeGen -InativeGen -Iparser
# Omitted: -I$(GHC_INCLUDE_DIR)
main/ParsePkgConf_HC_OPTS += -fno-warn-incomplete-patterns
# Use -fvia-C since the NCG can't handle the narrow16Int# (and intToInt16#?)
# primops on all platforms.
-parser/Parser_HC_OPTS += -Onot -fno-warn-incomplete-patterns -fvia-C
+parser/Parser_HC_OPTS += -fno-warn-incomplete-patterns -fvia-C
-# The latest GHC version doesn't have a -K option yet, and it doesn't
-# seem to be necessary anymore for the modules below.
-ifeq "$(compiling_with_4xx)" "YES"
-parser/Parser_HC_OPTS += -K2m
-endif
+# Careful optimisation of the parser: we don't want to throw everything
+# at it, because that takes too long and doesn't buy much, but we do want
+# to inline certain key external functions, so we instruct GHC not to
+# throw away inlinings as it would normally do in -Onot mode:
+parser/Parser_HC_OPTS += -Onot -fno-ignore-interface-pragmas
ifeq "$(HOSTPLATFORM)" "hppa1.1-hp-hpux9"
rename/RnMonad_HC_OPTS = -O2 -O2-for-C
utils/Digraph_HC_OPTS = -fglasgow-exts
+basicTypes/SrcLoc_HC_OPTS = -funbox-strict-fields
+
ifeq "$(bootstrapped)" "YES"
utils/Binary_HC_OPTS = -funbox-strict-fields
endif
main/SysTools_HC_OPTS += '-\#include <windows.h>' '-\#include <process.h>'
endif
-# Required due to use of Concurrent.myThreadId
-utils/Panic_HC_OPTS += -fvia-C
-
parser/Lexer_HC_OPTS += -funbox-strict-fields
# ghc_strlen percolates through so many modules that it is easier to get its
# typecheck/TcTyDecls_HC_OPTS += -auto-all
# typecheck/TcType_HC_OPTS += -auto-all
# typecheck/TcUnify_HC_OPTS += -auto-all
-#
-# absCSyn/PprAbsC_HC_OPTS += -auto-all
coreSyn/CorePrep_HC_OPTS += -auto-all
#-----------------------------------------------------------------------------
+# Building GHC package
+
+ifeq "$(BuildPackageGHC)" "YES"
+
+PACKAGE = ghc
+STANDALONE_PACKAGE = YES
+PACKAGE_DEPS = base haskell98
+
+endif
+
+#-----------------------------------------------------------------------------
# clean
MAINTAINER_CLEAN_FILES += parser/Parser.info main/ParsePkgConf.info
MKDEPENDHS_SRCS =
MKDEPENDC_SRCS =
+# Make doesn't work this out for itself, it seems
+parser/Parser.y : parser/Parser.y.pp
+EXTRA_SRCS += parser/Parser.y
+
include $(TOP)/mk/target.mk
# -----------------------------------------------------------------------------