projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[project @ 2004-08-13 13:04:50 by simonmar]
[ghc-hetmet.git]
/
ghc
/
compiler
/
Makefile
diff --git
a/ghc/compiler/Makefile
b/ghc/compiler/Makefile
index
6732083
..
ee40fc1
100644
(file)
--- a/
ghc/compiler/Makefile
+++ b/
ghc/compiler/Makefile
@@
-159,6
+159,7
@@
endif
# be to do `env PATH=$(PATH) make ghc' to minimise the environment. (or the
# equivalent of `env' if it doesn't exist locally).
#
# 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)
ifneq "$(way)" "dll"
ifneq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
HS_PROG=$(odir)/ghc$(_way)-$(ProjectVersion)
@@
-168,6
+169,7
@@
endif
else
HS_PROG=$(odir)/ghc-$(ProjectVersion)
endif
else
HS_PROG=$(odir)/ghc-$(ProjectVersion)
endif
+endif
# -----------------------------------------------------------------------------
# Create compiler configuration
# -----------------------------------------------------------------------------
# Create compiler configuration
@@
-230,8
+232,8
@@
CLEAN_FILES += $(CONFIG_HS)
ALL_DIRS = \
utils basicTypes types hsSyn prelude rename typecheck deSugar coreSyn \
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)
# Make sure we include Config.hs even if it doesn't exist yet...
ALL_SRCS += $(CONFIG_HS)
@@
-285,9
+287,6
@@
else
EXCLUDED_SRCS += deSugar/DsMeta.hs typecheck/TcSplice.lhs hsSyn/Convert.lhs
endif
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
#
# -----------------------------------------------
# mkdependC stuff
#
@@
-304,7
+303,7
@@
SRC_MKDEPENDC_OPTS += -I$(GHC_INCLUDE_DIR)
# Haskell compilations
SRC_HC_OPTS += \
# 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)
-I. -IcodeGen -InativeGen -Iparser
# Omitted: -I$(GHC_INCLUDE_DIR)
@@
-411,9
+410,6
@@
ifeq "$(HOSTPLATFORM)" "i386-unknown-mingw32"
main/SysTools_HC_OPTS += '-\#include <windows.h>' '-\#include <process.h>'
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
parser/Lexer_HC_OPTS += -funbox-strict-fields
# ghc_strlen percolates through so many modules that it is easier to get its
@@
-554,12
+550,21
@@
endif
# typecheck/TcTyDecls_HC_OPTS += -auto-all
# typecheck/TcType_HC_OPTS += -auto-all
# typecheck/TcUnify_HC_OPTS += -auto-all
# 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
#-----------------------------------------------------------------------------
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
# clean
MAINTAINER_CLEAN_FILES += parser/Parser.info main/ParsePkgConf.info