projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Force -fPIC when linking against dynamic libraries on Mac OS/X.
[ghc-hetmet.git]
/
compiler
/
main
/
StaticFlags.hs
diff --git
a/compiler/main/StaticFlags.hs
b/compiler/main/StaticFlags.hs
index
f310fa0
..
d57ca18
100644
(file)
--- a/
compiler/main/StaticFlags.hs
+++ b/
compiler/main/StaticFlags.hs
@@
-73,6
+73,7
@@
module StaticFlags (
v_Ld_inputs,
tablesNextToCode,
opt_StubDeadValues,
v_Ld_inputs,
tablesNextToCode,
opt_StubDeadValues,
+ opt_Ticky,
-- For the parser
addOpt, removeOpt, addWay, getWayFlags, v_opt_C_ready
-- For the parser
addOpt, removeOpt, addWay, getWayFlags, v_opt_C_ready
@@
-270,6
+271,8
@@
opt_UF_DearOp = ( 4 :: Int)
opt_PIC :: Bool
#if darwin_TARGET_OS && x86_64_TARGET_ARCH
opt_PIC = True
opt_PIC :: Bool
#if darwin_TARGET_OS && x86_64_TARGET_ARCH
opt_PIC = True
+#elif darwin_TARGET_OS
+opt_PIC = lookUp (fsLit "-fPIC") || not opt_Static
#else
opt_PIC = lookUp (fsLit "-fPIC")
#endif
#else
opt_PIC = lookUp (fsLit "-fPIC")
#endif
@@
-290,6
+293,8
@@
tablesNextToCode = not opt_Unregisterised
opt_ErrorSpans :: Bool
opt_ErrorSpans = lookUp (fsLit "-ferror-spans")
opt_ErrorSpans :: Bool
opt_ErrorSpans = lookUp (fsLit "-ferror-spans")
+opt_Ticky :: Bool
+opt_Ticky = lookUp (fsLit "-ticky")
-- object files and libraries to be linked in are collected here.
-- ToDo: perhaps this could be done without a global, it wasn't obvious
-- object files and libraries to be linked in are collected here.
-- ToDo: perhaps this could be done without a global, it wasn't obvious
@@
-306,7
+311,7
@@
GLOBAL_VAR(v_Ld_inputs, [], [String])
-- non-profiling objects.
-- After parsing the command-line options, we determine which "way" we
-- non-profiling objects.
-- After parsing the command-line options, we determine which "way" we
--- are building - this might be a combination way, eg. profiling+ticky-ticky.
+-- are building - this might be a combination way, eg. profiling+threaded.
-- We then find the "build-tag" associated with this way, and this
-- becomes the suffix used to find .hi files and libraries used in
-- We then find the "build-tag" associated with this way, and this
-- becomes the suffix used to find .hi files and libraries used in
@@
-317,7
+322,6
@@
data WayName
| WayDebug
| WayProf
| WayEventLog
| WayDebug
| WayProf
| WayEventLog
- | WayTicky
| WayPar
| WayGran
| WayNDP
| WayPar
| WayGran
| WayNDP
@@
-338,11
+342,6
@@
allowed_combination way = and [ x `allowedWith` y
_ `allowedWith` WayDyn = True
WayDyn `allowedWith` _ = True
_ `allowedWith` WayDyn = True
WayDyn `allowedWith` _ = True
- -- ticky is (now) allowed with everything
- -- Indeed, ticky should no longer be a 'way' at all
- _ `allowedWith` WayTicky = True
- WayTicky `allowedWith` _ = True
-
-- debug is allowed with everything
_ `allowedWith` WayDebug = True
WayDebug `allowedWith` _ = True
-- debug is allowed with everything
_ `allowedWith` WayDebug = True
WayDebug `allowedWith` _ = True
@@
-419,10
+418,6
@@
way_details =
[ "-DTRACING"
, "-optc-DTRACING" ],
[ "-DTRACING"
, "-optc-DTRACING" ],
- Way WayTicky "t" True "Ticky-ticky Profiling"
- [ "-DTICKY_TICKY"
- , "-optc-DTICKY_TICKY" ],
-
Way WayPar "mp" False "Parallel"
[ "-fparallel"
, "-D__PARALLEL_HASKELL__"
Way WayPar "mp" False "Parallel"
[ "-fparallel"
, "-D__PARALLEL_HASKELL__"