diff options
| author | Ian Lynagh <ian@well-typed.com> | 2012-10-14 01:31:20 +0100 |
|---|---|---|
| committer | Ian Lynagh <ian@well-typed.com> | 2012-10-14 01:31:20 +0100 |
| commit | a7c70e961208ceffd6a3a4626624740ea58dac0f (patch) | |
| tree | 0bffbe0e26f68491553a95f7040de67108c31ac6 | |
| parent | 817e1d58628b9a40a13dddb8b9c28431b3d256cc (diff) | |
| download | haskell-a7c70e961208ceffd6a3a4626624740ea58dac0f.tar.gz | |
Move the RPATH computation into the build rules
It doesn't really belong in package-data.mk
| -rw-r--r-- | rules/build-prog.mk | 2 | ||||
| -rw-r--r-- | utils/ghc-cabal/Main.hs | 4 |
2 files changed, 1 insertions, 5 deletions
diff --git a/rules/build-prog.mk b/rules/build-prog.mk index 239f55cdd4..a0cb9e64ce 100644 --- a/rules/build-prog.mk +++ b/rules/build-prog.mk @@ -175,7 +175,7 @@ ifneq "$3" "0" ifeq "$$(DYNAMIC_BY_DEFAULT)" "YES" $1_$2_GHC_LD_OPTS = \ -fno-use-rpaths \ - $$(addprefix -optl-Wl$$(comma)-rpath -optl-Wl$$(comma),$$($1_$2_RPATHS)) + $$(foreach d,$$($1_$2_TRANSITIVE_DEPS),-optl-Wl$$(comma)-rpath -optl-Wl$$(comma)'$$$$ORIGIN/../$$d') endif endif diff --git a/utils/ghc-cabal/Main.hs b/utils/ghc-cabal/Main.hs index 001e47420f..e179fc8cbf 100644 --- a/utils/ghc-cabal/Main.hs +++ b/utils/ghc-cabal/Main.hs @@ -372,9 +372,6 @@ generate config_args distdir directory transitive_dep_ids = map Installed.sourcePackageId dep_pkgs wrappedIncludeDirs <- wrap $ forDeps Installed.includeDirs wrappedLibraryDirs <- wrap libraryDirs - let depDynlibDirName d = display (Installed.sourcePackageId d) - rpaths = map (\d -> "'$$ORIGIN/../" ++ depDynlibDirName d ++ "'") - dep_pkgs let variablePrefix = directory ++ '_':distdir let xs = [variablePrefix ++ "_VERSION = " ++ display (pkgVersion (package pd)), @@ -386,7 +383,6 @@ generate config_args distdir directory variablePrefix ++ "_DEP_NAMES = " ++ unwords (map (display . packageName) dep_ids), variablePrefix ++ "_TRANSITIVE_DEPS = " ++ unwords (map display transitive_dep_ids), variablePrefix ++ "_TRANSITIVE_DEP_NAMES = " ++ unwords (map (display . packageName) transitive_dep_ids), - variablePrefix ++ "_RPATHS = " ++ unwords rpaths, variablePrefix ++ "_INCLUDE_DIRS = " ++ unwords (includeDirs bi), variablePrefix ++ "_INCLUDES = " ++ unwords (includes bi), variablePrefix ++ "_INSTALL_INCLUDES = " ++ unwords (installIncludes bi), |