Commit 1b98179e authored by Clemens Fruhwirth's avatar Clemens Fruhwirth
Browse files

Remove -fhardwire-lib-paths in favour of -dynload sysdep

parent 6c54855b
...@@ -35,7 +35,7 @@ import Module ...@@ -35,7 +35,7 @@ import Module
import UniqFM ( eltsUFM ) import UniqFM ( eltsUFM )
import ErrUtils import ErrUtils
import DynFlags import DynFlags
import StaticFlags ( v_Ld_inputs, opt_Static, opt_HardwireLibPaths, WayName(..) ) import StaticFlags ( v_Ld_inputs, opt_Static, WayName(..) )
import Config import Config
import Panic import Panic
import Util import Util
...@@ -1197,8 +1197,12 @@ linkBinary dflags o_files dep_packages = do ...@@ -1197,8 +1197,12 @@ linkBinary dflags o_files dep_packages = do
pkg_lib_paths <- getPackageLibraryPath dflags dep_packages pkg_lib_paths <- getPackageLibraryPath dflags dep_packages
let pkg_lib_path_opts = concat (map get_pkg_lib_path_opts pkg_lib_paths) let pkg_lib_path_opts = concat (map get_pkg_lib_path_opts pkg_lib_paths)
get_pkg_lib_path_opts l | opt_HardwireLibPaths && not opt_Static = ["-L" ++ l, "-Wl,-rpath", "-Wl," ++ l] #ifdef linux_TARGET_OS
| otherwise = ["-L" ++ l] get_pkg_lib_path_opts l | (dynLibLoader dflags)==SystemDependent && not opt_Static = ["-L" ++ l, "-Wl,-rpath", "-Wl," ++ l]
| otherwise = ["-L" ++ l]
#else
get_pkg_lib_path_opts l = ["-L" ++ l]
#endif
let lib_paths = libraryPaths dflags let lib_paths = libraryPaths dflags
let lib_path_opts = map ("-L"++) lib_paths let lib_path_opts = map ("-L"++) lib_paths
......
...@@ -64,7 +64,6 @@ module StaticFlags ( ...@@ -64,7 +64,6 @@ module StaticFlags (
-- Related to linking -- Related to linking
opt_PIC, opt_PIC,
opt_Static, opt_Static,
opt_HardwireLibPaths,
-- misc opts -- misc opts
opt_IgnoreDotGhci, opt_IgnoreDotGhci,
...@@ -336,7 +335,6 @@ opt_PIC = True ...@@ -336,7 +335,6 @@ opt_PIC = True
opt_PIC = lookUp FSLIT("-fPIC") opt_PIC = lookUp FSLIT("-fPIC")
#endif #endif
opt_Static = lookUp FSLIT("-static") opt_Static = lookUp FSLIT("-static")
opt_HardwireLibPaths = lookUp FSLIT("-fhardwire-lib-paths")
opt_Unregisterised = lookUp FSLIT("-funregisterised") opt_Unregisterised = lookUp FSLIT("-funregisterised")
-- Derived, not a real option. Determines whether we will be compiling -- Derived, not a real option. Determines whether we will be compiling
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment