projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Clean up the debugger code
[ghc-hetmet.git]
/
compiler
/
main
/
DriverPipeline.hs
diff --git
a/compiler/main/DriverPipeline.hs
b/compiler/main/DriverPipeline.hs
index
08d568f
..
c690e84
100644
(file)
--- a/
compiler/main/DriverPipeline.hs
+++ b/
compiler/main/DriverPipeline.hs
@@
-461,15
+461,9
@@
doLink dflags stop_phase o_files
| otherwise
= case ghcLink dflags of
NoLink -> return ()
| otherwise
= case ghcLink dflags of
NoLink -> return ()
- LinkBinary -> linkBinary dflags o_files link_pkgs
+ LinkBinary -> linkBinary dflags o_files []
LinkDynLib -> linkDynLib dflags o_files []
other -> panicBadLink other
LinkDynLib -> linkDynLib dflags o_files []
other -> panicBadLink other
- where
- -- Always link in the haskell98 package for static linking. Other
- -- packages have to be specified via the -package flag.
- link_pkgs
- | dopt Opt_AutoLinkPackages dflags = [haskell98PackageId]
- | otherwise = []
-- ---------------------------------------------------------------------------
-- ---------------------------------------------------------------------------
@@
-1538,7
+1532,7
@@
linkBinary dflags o_files dep_packages = do
let
thread_opts | WayThreaded `elem` ways = [
let
thread_opts | WayThreaded `elem` ways = [
-#if !defined(mingw32_TARGET_OS) && !defined(freebsd_TARGET_OS) && !defined(haiku_TARGET_OS)
+#if !defined(mingw32_TARGET_OS) && !defined(freebsd_TARGET_OS) && !defined(openbsd_TARGET_OS) && !defined(haiku_TARGET_OS)
"-lpthread"
#endif
#if defined(osf3_TARGET_OS)
"-lpthread"
#endif
#if defined(osf3_TARGET_OS)
@@
-1872,17
+1866,10
@@
doCpp dflags raw include_cc_opts input_fn output_fn = do
, SysTools.FileOption "" output_fn
])
, SysTools.FileOption "" output_fn
])
-cHaskell1Version :: String
-cHaskell1Version = "5" -- i.e., Haskell 98
-
hsSourceCppOpts :: [String]
-- Default CPP defines in Haskell source
hsSourceCppOpts =
hsSourceCppOpts :: [String]
-- Default CPP defines in Haskell source
hsSourceCppOpts =
- [ "-D__HASKELL1__="++cHaskell1Version
- , "-D__GLASGOW_HASKELL__="++cProjectVersionInt
- , "-D__HASKELL98__"
- , "-D__CONCURRENT_HASKELL__"
- ]
+ [ "-D__GLASGOW_HASKELL__="++cProjectVersionInt ]
-- -----------------------------------------------------------------------------
-- -----------------------------------------------------------------------------