X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Fconfig.mk.in;h=3bffb6ac4f04eed2e746c9eb160166c28dee8a88;hb=50027272414438955dbc41696541cbd25da55883;hp=ce53b2860d893945b9ed5a72680a1c1eaa29affa;hpb=74880a8273639d26b7d492d8808df69debaa4a53;p=ghc-hetmet.git

diff --git a/mk/config.mk.in b/mk/config.mk.in
index ce53b28..3bffb6a 100644
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -97,8 +97,11 @@ exeext=@exeext@
 #
 ################################################################################
 
+# BootingFromHc - build GHC and the libraries from .hc files?
+BootingFromHc = @BootingFromHc@
+
 # build the libs first if we're bootstrapping from .hc files
-ifeq "$(GhcWithHscBuiltViaC)" "YES"
+ifeq "$(BootingFromHc)" "YES"
 AllProjects = glafp-utils hslibs ghc green-card happy hdirect hood nofib
 else
 AllProjects = glafp-utils ghc hslibs green-card happy hdirect hood nofib
@@ -156,9 +159,6 @@ GhcCompilerWays=
 #			a pretty strong internal check
 GhcHcOpts=-O -Rghc-timing
 
-# GhcWithHscBuiltViaC - build GHC compiler proper (\`hsc') from .hc files?
-GhcWithHscBuiltViaC=@BootingFromHc@
-
 # Build a compiler that will build *unregisterised* libraries and
 # binaries by default.  Unregisterised code is supposed to compile and
 # run without any support for architecture-specific assembly mangling,
@@ -188,13 +188,18 @@ else
 GhcWithNativeCodeGen=NO
 endif
 
+HaveLibDL = @HaveLibDL@
+
 # Include GHCi in the compiler.  Default to NO for the time being.
 
-# ifneq "$(findstring $(HostOS_CPP), linux solaris freebsd netbsd openbsd)" ""
-# GhcWithInterpreter=YES
-# else 
+ifneq "$(findstring $(HostOS_CPP), linux solaris freebsd netbsd openbsd)" ""
+GhcWithInterpreter=YES
+ifeq "$(HaveLibDL)" "YES"
+SRC_HC_OPTS += -ldl
+endif
+else 
 GhcWithInterpreter=NO
-# endif
+endif
 
 #
 # Building various ways?
@@ -202,11 +207,6 @@ GhcWithInterpreter=NO
 BuildingParallel=$(subst mp,YES,$(filter mp,$(WAYS)))
 BuildingGranSim=$(subst mg,YES,$(filter mg,$(WAYS)))
 
-# Include compiler support for letting the compiler (optionally) report
-# your compilation to a central server for generation of fun stats.
-#
-GhcReportCompiles=NO
-
 #------------------------------------------------------------------------------
 # Options for GHC's Prelude
 
@@ -214,7 +214,7 @@ GhcReportCompiles=NO
 # In addition to the normal sequential way, the default is to also build
 # profiled prelude libraries.
 # When booting from .hc files, turn this off.
-ifeq "$(GhcWithHscBuiltViaC)" "YES"
+ifeq "$(BootingFromHc)" "YES"
 GhcLibWays=
 else
 GhcLibWays=p
@@ -231,14 +231,18 @@ endif
 GhcLibHcOpts=-O -Rghc-timing
 
 # Win32 only: Enable the RTS and libraries to be built as DLLs
-# Don't split object files for libs if we're building DLLs
 DLLized=@EnableWin32DLLs@
+
+# Don't split object files for libs if we're building DLLs, or booting from
+# .hc files.
+SplitObjs=YES
+
 ifeq "$(DLLized)" "YES"
 SplitObjs=NO
-else
-SplitObjs=YES
 endif
-
+ifeq "$(BootingFromHc)" "YES"
+SplitObjs=NO
+endif
 
 # Strip local symbols from libraries?  This can make the libraries smaller,
 # but makes debugging somewhat more difficult.  Doesn't work with all ld's.
@@ -295,6 +299,9 @@ LibsReadline=@LibsReadline@
 #
 ReadlineIncludePath=
 
+# Math library
+LIBM=@LIBM@
+
 # Build the Haskell OpenGL/GLUT binding?
 #
 GhcLibsWithHOpenGL=@GhcLibsWithHOpenGL@
@@ -375,7 +382,7 @@ NoFibHcOpts = -O
 ################################################################################
 
 # Directory used by GHC (and possibly other tools) for storing
-# temporary files.  If your /tmp isn't big enough, either override
+# temporary files.  If your TMPDIR isn't big enough, either override
 # this in build.mk or set your environment variable "TMPDIR" to point
 # to somewhere with more space.  (TMPDIR=. is a good choice).
 
@@ -396,10 +403,10 @@ endif
 
 FPTOOLS_TOP_ABS		= @hardtop@
 ifeq "$(TARGETPLATFORM)" "i386-unknown-cygwin32"
-FPTOOLS_TOP_ABS		= $(patsubst /cygdrive/%/,%:/,@hardtop@)
+FPTOOLS_TOP_ABS		= $(subst \,/,$(shell cygpath -w @hardtop@))
 endif
 ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
-FPTOOLS_TOP_ABS		= $(patsubst /cygdrive/%/,%:/,@hardtop@)
+FPTOOLS_TOP_ABS		= $(subst \,/,$(shell cygpath -w @hardtop@))
 endif
 
 #
@@ -572,6 +579,9 @@ else
 endif
 endif
 
+# default C compiler flags
+SRC_CC_OPTS = -O
+
 #-----------------------------------------------------------------------------
 # GMP Library (version 2.0.x or above)
 #
@@ -733,7 +743,7 @@ HAPPY_VERSION		= @HappyVersion@
 #
 # Options to pass to Happy when we're going to compile the output with GHC
 #
-GHC_HAPPY_OPTS		= $(shell if expr $(HAPPY_VERSION) \< "1.8" >/dev/null; then echo -g; else echo -agc; fi)
+GHC_HAPPY_OPTS		= $(shell if ( test `echo $(HAPPY_VERSION) | sed -e "s/\(.*\)\..*/\1/g"` "-gt" "1" || test `echo $(HAPPY_VERSION) | sed -e "s/.*\.\(.*\)/\1/g"` "-ge" "9" ); then echo -agc; else echo -g; fi)
 
 #
 # Stuff from fptools/literate