From a7c70e961208ceffd6a3a4626624740ea58dac0f Mon Sep 17 00:00:00 2001 From: Ian Lynagh Date: Sun, 14 Oct 2012 01:31:20 +0100 Subject: Move the RPATH computation into the build rules It doesn't really belong in package-data.mk --- utils/ghc-cabal/Main.hs | 4 ---- 1 file changed, 4 deletions(-) (limited to 'utils/ghc-cabal') 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), -- cgit v1.2.1