More build system changes; ghc-pkg is now built with Cabal

[ghc-hetmet.git] / compiler / main / DriverPipeline.hs

diff --git a/compiler/main/DriverPipeline.hs b/compiler/main/DriverPipeline.hs
index b848e83..9b0cd0e 100644 (file)
--- a/compiler/main/DriverPipeline.hs
+++ b/compiler/main/DriverPipeline.hs
@@ -1,3 +1,6 @@
+{-# OPTIONS -fno-cse #-}
+-- -fno-cse is needed for GLOBAL_VAR's to behave properly
+
 -----------------------------------------------------------------------------
 --
 -- GHC Driver
@@ -389,7 +392,9 @@ doLink dflags stop_phase o_files
   where
    -- Always link in the haskell98 package for static linking.  Other
    -- packages have to be specified via the -package flag.
-    link_pkgs = [haskell98PackageId]
+    link_pkgs
+     | dopt Opt_AutoLinkPackages dflags = [haskell98PackageId]
+     | otherwise                        = []
 
 
 -- ---------------------------------------------------------------------------