projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Stop passing -Wl,-macosx_version_min to gcc
[ghc-hetmet.git]
/
compiler
/
main
/
DriverPipeline.hs
diff --git
a/compiler/main/DriverPipeline.hs
b/compiler/main/DriverPipeline.hs
index
d54bb0f
..
f748f7c
100644
(file)
--- a/
compiler/main/DriverPipeline.hs
+++ b/
compiler/main/DriverPipeline.hs
@@
-826,6
+826,7
@@
runPhase (Hsc src_flavour) stop hsc_env basename suff input_fn get_output_fn _ma
src_timestamp <- liftIO $ getModificationTime (basename <.> suff)
let force_recomp = dopt Opt_ForceRecomp dflags
src_timestamp <- liftIO $ getModificationTime (basename <.> suff)
let force_recomp = dopt Opt_ForceRecomp dflags
+ hsc_lang = hscMaybeAdjustTarget dflags stop src_flavour (hscTarget dflags)
source_unchanged <-
if force_recomp || not (isStopLn stop)
-- Set source_unchanged to False unconditionally if
source_unchanged <-
if force_recomp || not (isStopLn stop)
-- Set source_unchanged to False unconditionally if
@@
-842,7
+843,6
@@
runPhase (Hsc src_flavour) stop hsc_env basename suff input_fn get_output_fn _ma
else return False
-- get the DynFlags
else return False
-- get the DynFlags
- let hsc_lang = hscMaybeAdjustTarget dflags stop src_flavour (hscTarget dflags)
let next_phase = hscNextPhase dflags src_flavour hsc_lang
output_fn <- liftIO $ get_output_fn dflags next_phase (Just location4)
let next_phase = hscNextPhase dflags src_flavour hsc_lang
output_fn <- liftIO $ get_output_fn dflags next_phase (Just location4)
@@
-1689,10
+1689,6
@@
linkDynLib dflags o_files dep_packages = do
-- Build the dynamic library as a single "module", i.e. no dynamic binding
-- nonsense when referring to symbols from within the library. The NCG
-- assumes that this option is specified (on i386, at least).
-- Build the dynamic library as a single "module", i.e. no dynamic binding
-- nonsense when referring to symbols from within the library. The NCG
-- assumes that this option is specified (on i386, at least).
- -- -Wl,-macosx_version_min -Wl,10.3
- -- Tell the linker its safe to assume that the library will run on 10.3 or
- -- later, so that it will not complain about the use of the option
- -- -undefined dynamic_lookup above.
-- -install_name
-- Mac OS/X stores the path where a dynamic library is (to be) installed
-- in the library itself. It's called the "install name" of the library.
-- -install_name
-- Mac OS/X stores the path where a dynamic library is (to be) installed
-- in the library itself. It's called the "install name" of the library.
@@
-1719,7
+1715,7
@@
linkDynLib dflags o_files dep_packages = do
++ map SysTools.Option (
md_c_flags
++ o_files
++ map SysTools.Option (
md_c_flags
++ o_files
- ++ [ "-undefined", "dynamic_lookup", "-single_module", "-Wl,-macosx_version_min","-Wl,10.5",
+ ++ [ "-undefined", "dynamic_lookup", "-single_module",
"-Wl,-read_only_relocs,suppress", "-install_name", instName ]
++ extra_ld_inputs
++ lib_path_opts
"-Wl,-read_only_relocs,suppress", "-install_name", instName ]
++ extra_ld_inputs
++ lib_path_opts