public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pkgs/build-support/cabal: clean up the code that sets rpath for shared executables

Browse Source
This commit is contained in:
Peter Simons 2013-12-16 21:20:49 +01:00
parent 45e8de9a7d
commit 8b11fb8fcb
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/build-support/cabal/default.nix
View File

@ -156,7 +156,7 @@ assert !enableStaticLibraries -> versionOlder "7.7" ghc.version;
(optional (versionOlder "7" ghc.version) (enableFeature self.enableStaticLibraries "library-vanilla")) (optional (versionOlder "7" ghc.version) (enableFeature self.enableStaticLibraries "library-vanilla"))
(optional (versionOlder "7.4" ghc.version) (enableFeature self.enableSharedExecutables "executable-dynamic")) (optional (versionOlder "7.4" ghc.version) (enableFeature self.enableSharedExecutables "executable-dynamic"))
(optional (versionOlder "7" ghc.version) (enableFeature self.doCheck "tests")) (optional (versionOlder "7" ghc.version) (enableFeature self.doCheck "tests"))
] ++ optional self.enableSharedExecutables "--ghc-option=-optl=-Wl,-rpath=$ORIGIN/../lib/${ghc.ghc.name}/${self.pname}-${self.version}"; ];
# GHC needs the locale configured during the Haddock phase. # GHC needs the locale configured during the Haddock phase.
LANG = "en_US.UTF-8"; LANG = "en_US.UTF-8";
@ -187,6 +187,10 @@ assert !enableStaticLibraries -> versionOlder "7.7" ghc.version;
done done
done done
${optionalString self.enableSharedExecutables ''
configureFlags+=" --ghc-option=-optl=-Wl,-rpath=$out/lib/${ghc.ghc.name}/${self.pname}-${self.version}";
''}
echo "configure flags: $extraConfigureFlags $configureFlags" echo "configure flags: $extraConfigureFlags $configureFlags"
./Setup configure --verbose --prefix="$out" --libdir='$prefix/lib/$compiler' --libsubdir='$pkgid' $extraConfigureFlags $configureFlags ./Setup configure --verbose --prefix="$out" --libdir='$prefix/lib/$compiler' --libsubdir='$pkgid' $extraConfigureFlags $configureFlags