X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Fconfig.mk.in;h=dc252ee1eeefb9982bec1e16a5970edf17e999cc;hb=ccecbdb59dbe0ce19ec952ad72210662ec0c3528;hp=b3f63e9541691d99b524a8bf1876817d450eecea;hpb=51e17ea66608cfb85c2d5c6687df5fe83f191820;p=ghc-hetmet.git

diff --git a/mk/config.mk.in b/mk/config.mk.in
index b3f63e9..dc252ee 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,
@@ -214,7 +214,7 @@ BuildingGranSim=$(subst mg,YES,$(filter mg,$(WAYS)))
 # 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.
@@ -258,7 +262,7 @@ StripLibraries=NO
 
 # For an optimised RTS:
 GhcRtsHcOpts=-O2
-GhcRtsCcOpts=-O2 -optc-fomit-frame-pointer
+GhcRtsCcOpts=-O2 -fomit-frame-pointer
 
 # Include the front panel code?  Needs GTK+.
 GhcRtsWithFrontPanel = NO
@@ -290,14 +294,14 @@ GhcLibsWithReadline=@HaveReadlineHeaders@
 # Libraries needed for linking with readline
 LibsReadline=@LibsReadline@
 
-# Math library
-LIBM=@LIBM@
-
 # Include path to readline.h
 # (no path == in standard include path)
 #
 ReadlineIncludePath=
 
+# Math library
+LIBM=@LIBM@
+
 # Build the Haskell OpenGL/GLUT binding?
 #
 GhcLibsWithHOpenGL=@GhcLibsWithHOpenGL@
@@ -378,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).
 
@@ -398,11 +402,12 @@ endif
 # FPTOOLS_TOP: the top of the fptools hierarchy, absolute path.
 
 FPTOOLS_TOP_ABS		= @hardtop@
+FPTOOLS_TOP_ABS_UNIX    = @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
 
 #
@@ -480,6 +485,21 @@ endif
 #
 #	SRC_HC_OPTS += -O
 
+# These flags make flex 8-bit
+SRC_FLEX_OPTS	+= -8
+
+SRC_INSTALL_BIN_OPTS	+= -s
+
+# lint gets all CPP's flags too
+SRC_LINT_OPTS		+= -axz -DLINT $(SRC_CPP_OPTS)
+WAY$(_way)_LINT_OPTS	+= WAY$(_way)_CPP_OPTS
+
+# Default fptools options for dllwrap.
+SRC_BLD_DLL_OPTS += -mno-cygwin --target=i386-mingw32
+
+# Flags for CPP when running GreenCard on .pgc files
+GC_CPP_OPTS += -P -E -x c -traditional -D__GLASGOW_HASKELL__
+
 
 ################################################################################
 #
@@ -575,6 +595,12 @@ else
 endif
 endif
 
+# default C compiler flags
+SRC_CC_OPTS = -O
+ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
+SRC_CC_OPTS += -mno-cygwin -mwin32
+endif
+
 #-----------------------------------------------------------------------------
 # GMP Library (version 2.0.x or above)
 #
@@ -736,7 +762,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