projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make the running_finalizers flag task-local
[ghc-hetmet.git]
/
mk
/
config.mk.in
diff --git
a/mk/config.mk.in
b/mk/config.mk.in
index
a640c3e
..
d12cbff
100644
(file)
--- a/
mk/config.mk.in
+++ b/
mk/config.mk.in
@@
-102,7
+102,7
@@
GhcDebugged=NO
GhcLibProfiled=$(if $(filter p,$(GhcLibWays)),YES,NO)
# Do we support shared libs?
GhcLibProfiled=$(if $(filter p,$(GhcLibWays)),YES,NO)
# Do we support shared libs?
-PlatformSupportsSharedLibs = $(if $(filter $(TARGETPLATFORM),i386-unknown-linux x86_64-unknown-linux i386-unknown-freebsd amd64-unknown-freebsd i386-unknown-mingw32),YES,NO)
+PlatformSupportsSharedLibs = $(if $(filter $(TARGETPLATFORM),i386-unknown-linux x86_64-unknown-linux i386-unknown-freebsd x86_64-unknown-freebsd i386-unknown-mingw32 i386-apple-darwin),YES,NO)
# ToDo later:
# BuildStaticLibs=@BuildStaticLibs@
# ToDo later:
# BuildStaticLibs=@BuildStaticLibs@
@@
-302,14
+302,16
@@
SupportsSplitObjs=$(strip $(if $(filter YES,$(ArchSupportsSplitObjs)),\
# By default, enable SplitObjs for the libraries if this build supports it
SplitObjs=$(SupportsSplitObjs)
# By default, enable SplitObjs for the libraries if this build supports it
SplitObjs=$(SupportsSplitObjs)
-# .NET interop support?
-#
-DotnetSupport=NO
+# ----------------------------------------------------------------------------
+# Package-related things
-# Build unix package?
-#
-GhcLibsWithUnix=@GhcLibsWithUnix@
+# Extra packages to add to the build, in dependency order
+EXTRA_PACKAGES =
+
+# Whether to install $(EXTRA_PACKAGES)
+InstallExtraPackages = NO
+# Run "ghc-pkg check" on each package
CHECK_PACKAGES = NO
# ----------------------------------------------------------------------------
CHECK_PACKAGES = NO
# ----------------------------------------------------------------------------
@@
-497,7
+499,6
@@
GhcMajVersion = @GhcMajVersion@
GhcMinVersion = @GhcMinVersion@
# Keep this in sync with the variables in package-config.mk
GhcMinVersion = @GhcMinVersion@
# Keep this in sync with the variables in package-config.mk
-ghc_ge_609 = @ghc_ge_609@
ghc_ge_6102 = @ghc_ge_6102@
ghc_ge_611 = @ghc_ge_611@
ghc_ge_613 = @ghc_ge_613@
ghc_ge_6102 = @ghc_ge_6102@
ghc_ge_611 = @ghc_ge_611@
ghc_ge_613 = @ghc_ge_613@
@@
-563,6
+564,7
@@
DLLTOOL = inplace/mingw/bin/dlltool.exe
AR = @ArCmd@
AR_OPTS = @ArArgs@
ArSupportsInput = @ArSupportsInput@
AR = @ArCmd@
AR_OPTS = @ArArgs@
ArSupportsInput = @ArSupportsInput@
+ArSupportsAtFile = @ArSupportsAtFile@
# Yuckage: for ghc/utils/parallel -- todo: nuke this dependency!!
BASH = /usr/local/bin/bash
# Yuckage: for ghc/utils/parallel -- todo: nuke this dependency!!
BASH = /usr/local/bin/bash