From 633a6783b85f37e4d8055a21daaed6587721eb02 Mon Sep 17 00:00:00 2001
From: simonmar <unknown>
Date: Fri, 2 Jun 2000 12:16:19 +0000
Subject: [PATCH] [project @ 2000-06-02 12:16:19 by simonmar] add new flag
 -fglasgow-exts-no-lang, which is the same as -fglsagow-exts
 but doesn't include the implicit -package lang.  This is
 needed only for compiling ghc/lib/std, where hslibs/lang
 may or may not exist.

---
 ghc/driver/ghc.lprl  |   10 +++++++---
 ghc/lib/std/Makefile |    2 +-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/ghc/driver/ghc.lprl b/ghc/driver/ghc.lprl
index 65351c0..742f8c7 100644
--- a/ghc/driver/ghc.lprl
+++ b/ghc/driver/ghc.lprl
@@ -3214,14 +3214,20 @@ arg: while($_ = $Args[0]) {
     /^-fallow-undecidable-instances$/ && do { push(@HsC_flags, $_); next arg; };
     /^-fhistory-size.*$/ 	      && do { push(@HsC_flags, $_); next arg; };
     /^-fdicts-strict$/ 	  	      && do { push(@HsC_flags, $_); next arg; };
+
     /^-fglasgow-exts$/
 		&& do { push(@HsC_flags, $_);
 
-			# -fglasgow-exts implies -syslib lang
+			# -fglasgow-exts implies -package lang
 			&add_syslib('lang');
 
 			next arg; };
 
+	# for compiling lib/std we can't add the implicit package lang,
+	# because it isn't built yet.
+    /^-fglasgow-exts-no-lang$/
+		&& do { push(@HsC_flags, "-fglasgow-exts"); next arg; };
+
     /^-fspeciali[sz]e$/
 		&& do { $Oopt_DoSpecialise = '-fspecialise'; next arg; };
     /^-fno-speciali[sz]e$/
@@ -3231,8 +3237,6 @@ arg: while($_ = $Args[0]) {
                 && do {  $Oopt_UsageSPInf = '-fusagesp';
                          push (@HsC_flags, '-fusagesp-on'); next arg; };
 
-    /^-fcompiling-prelude$/ && do { $CompilingPrelude=1; push(@HsC_flags, $_); next arg; };
-
 # Now the foldr/build options, which are *on* by default (for -O).
 
     /^-ffoldr-build$/
diff --git a/ghc/lib/std/Makefile b/ghc/lib/std/Makefile
index a5eec7c..5ca3ab6 100644
--- a/ghc/lib/std/Makefile
+++ b/ghc/lib/std/Makefile
@@ -41,7 +41,7 @@ endif
 #-----------------------------------------------------------------------------
 # 	Setting the GHC compile options
 
-SRC_HC_OPTS += -recomp -cpp -fglasgow-exts -fvia-C -Rghc-timing $(GhcLibHcOpts) $(PACKAGE)
+SRC_HC_OPTS += -recomp -cpp -fglasgow-exts-no-lang -fvia-C -Rghc-timing $(GhcLibHcOpts) $(PACKAGE)
 ifneq "$(way)" "dll"
 SRC_HC_OPTS += -static
 endif
-- 
1.7.10.4