X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fdriver%2FMakefile;h=cd2a720ffb467222c7dfc6a5afa6d521fc9f9ea5;hb=2ce9f3af8a25f0ff3488a14ae2883111447f1c9c;hp=79f6307d2b30ae87b22e2b20a6d0f0a1d4a9eed7;hpb=a169003f1e0d92cb1e77abbad1cac52aed442a58;p=ghc-hetmet.git

diff --git a/ghc/driver/Makefile b/ghc/driver/Makefile
index 79f6307..cd2a720 100644
--- a/ghc/driver/Makefile
+++ b/ghc/driver/Makefile
@@ -1,5 +1,4 @@
 #-----------------------------------------------------------------------------
-# $Id: Makefile,v 1.59 2001/03/31 10:28:42 panne Exp $
 #
 
 TOP=..
@@ -20,25 +19,26 @@ PKGCONF_OPTS = "$(TARGETPLATFORM)"		\
 	       "$(CURRENT_DIR)"			\
 	       "$(HaveLibGmp)"			\
 	       "$(LibsReadline)"		\
-	       "$(libdir)"			\
 	       "$(GHC_LIB_DIR)"			\
 	       "$(GHC_RUNTIME_DIR)"		\
 	       "$(GHC_UTILS_DIR)"		\
-	       "$(GHC_INCLUDE_DIR)"		\
-	       "$(FPTOOLS_TOP_ABS)"
+	       "$(GHC_INCLUDE_DIR)"
 
-ghc_407_at_least = $(shell expr "$(GhcMinVersion)" \>= 7)
-ifeq "$(ghc_407_at_least)" "1"
+SRC_HC_OPTS += -fglasgow-exts -cpp 
+
+ghc_407_at_least = $(shell if (test $(GhcCanonVersion) -ge 407); then echo YES; else echo NO; fi)
+
+ifeq "$(ghc_407_at_least)" "YES"
+SRC_HC_OPTS += -package concurrent -package text
 ifneq "$(mingw32_TARGET_OS)" "1"
-SRC_HC_OPTS += -fglasgow-exts -cpp -package concurrent -package posix -package text
-else
-SRC_HC_OPTS += -fglasgow-exts -cpp -package concurrent -package text
+SRC_HC_OPTS += -package posix
 endif
 else
-SRC_HC_OPTS += -fglasgow-exts -cpp -syslib concurrent -syslib posix -syslib misc
+SRC_HC_OPTS += -syslib concurrent -syslib posix -syslib misc
 endif
 
 SRC_HC_OPTS += -DWANT_PRETTY
+SRC_HC_OPTS += $(filter -D% -U%,$(GhcRtsCcOpts))
 
 all :: package.conf package.conf.inplace
 
@@ -56,7 +56,7 @@ Package.o : ../utils/ghc-pkg/Package.hs
 override datadir = $(libdir)
 INSTALL_DATAS += package.conf ghc-usage.txt
 
-CLEAN_FILES += pkgconf package.conf.inplace package.conf
+CLEAN_FILES += Main.hi pkgconf package.conf.inplace package.conf
 
 # -----------------------------------------------------------------------------