LLVM-3.9: Fix RPATH in cross compile builds
This error was cause by multiple-outputs.sh not setting NIX_CROSS_LDFLAGS
This commit is contained in:
parent
12bbc63024
commit
fea424fea3
pkgs/development/compilers/llvm/3.9
|
@ -81,6 +81,12 @@ in stdenv.mkDerivation rec {
|
||||||
preBuild = ''
|
preBuild = ''
|
||||||
mkdir -p $out/
|
mkdir -p $out/
|
||||||
ln -sv $PWD/lib $out
|
ln -sv $PWD/lib $out
|
||||||
|
''
|
||||||
|
+ # This is a good candidate for using the `placeholder` primitive when it's released
|
||||||
|
# This should hopefully be unnecessary once
|
||||||
|
# https://github.com/NixOS/nixpkgs/pull/25047 is merged
|
||||||
|
stdenv.lib.optionalString (buildPlatform != hostPlatform && enableSharedLibraries) ''
|
||||||
|
export NIX_CROSS_LDFLAGS="-rpath $lib/lib -rpath $lib/lib64 $NIX_CROSS_LDFLAGS"
|
||||||
'';
|
'';
|
||||||
|
|
||||||
cmakeFlags = with stdenv; [
|
cmakeFlags = with stdenv; [
|
||||||
|
|
Loading…
Reference in New Issue