diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2018-12-24 15:02:29 +0100 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2018-12-24 15:02:29 +0100 |
| commit | ef935fa1016ba6209a8882f4ccd776c5272a4359 (patch) | |
| tree | 8d4c66fda8f30dc3bb2a1c5ce5da5b7fca999dd8 /pkgs/development/compilers/llvm | |
| parent | d5d15828b51a7d4fd7eee82c6e9a1b261aa49115 (diff) | |
| parent | dd3eea4b476552cbdf95388179bfdd668d04b8b7 (diff) | |
| download | nixlib-ef935fa1016ba6209a8882f4ccd776c5272a4359.tar nixlib-ef935fa1016ba6209a8882f4ccd776c5272a4359.tar.gz nixlib-ef935fa1016ba6209a8882f4ccd776c5272a4359.tar.bz2 nixlib-ef935fa1016ba6209a8882f4ccd776c5272a4359.tar.lz nixlib-ef935fa1016ba6209a8882f4ccd776c5272a4359.tar.xz nixlib-ef935fa1016ba6209a8882f4ccd776c5272a4359.tar.zst nixlib-ef935fa1016ba6209a8882f4ccd776c5272a4359.zip | |
Merge branch 'master' into staging
Diffstat (limited to 'pkgs/development/compilers/llvm')
12 files changed, 28 insertions, 0 deletions
diff --git a/pkgs/development/compilers/llvm/4/libc++/default.nix b/pkgs/development/compilers/llvm/4/libc++/default.nix index 2b543b9d793a..6344304b84bf 100644 --- a/pkgs/development/compilers/llvm/4/libc++/default.nix +++ b/pkgs/development/compilers/llvm/4/libc++/default.nix @@ -44,6 +44,11 @@ stdenv.mkDerivation rec { linkCxxAbi = stdenv.isLinux; + postInstall = '' + mv $out/lib/libc++.a $out/lib/libc++_static.a + cp ${./libc++.a} $out/lib/libc++.a + ''; + setupHooks = [ ../../../../../build-support/setup-hooks/role.bash ./setup-hook.sh diff --git a/pkgs/development/compilers/llvm/4/libc++/libc++.a b/pkgs/development/compilers/llvm/4/libc++/libc++.a new file mode 100644 index 000000000000..f676948115eb --- /dev/null +++ b/pkgs/development/compilers/llvm/4/libc++/libc++.a @@ -0,0 +1 @@ +INPUT(-lc++_static -lc++abi) diff --git a/pkgs/development/compilers/llvm/4/libc++abi.nix b/pkgs/development/compilers/llvm/4/libc++abi.nix index 5eeec395b97a..735c5e9e7435 100644 --- a/pkgs/development/compilers/llvm/4/libc++abi.nix +++ b/pkgs/development/compilers/llvm/4/libc++abi.nix @@ -34,6 +34,7 @@ stdenv.mkDerivation { '' else '' install -d -m 755 $out/include $out/lib + install -m 644 lib/libc++abi.a $out/lib install -m 644 lib/libc++abi.so.1.0 $out/lib install -m 644 ../include/cxxabi.h $out/include ln -s libc++abi.so.1.0 $out/lib/libc++abi.so diff --git a/pkgs/development/compilers/llvm/5/libc++/default.nix b/pkgs/development/compilers/llvm/5/libc++/default.nix index b182f1250e72..6dc81e10163f 100644 --- a/pkgs/development/compilers/llvm/5/libc++/default.nix +++ b/pkgs/development/compilers/llvm/5/libc++/default.nix @@ -38,6 +38,11 @@ stdenv.mkDerivation rec { linkCxxAbi = stdenv.isLinux; + postInstall = '' + mv $out/lib/libc++.a $out/lib/libc++_static.a + cp ${./libc++.a} $out/lib/libc++.a + ''; + setupHooks = [ ../../../../../build-support/setup-hooks/role.bash ./setup-hook.sh diff --git a/pkgs/development/compilers/llvm/5/libc++/libc++.a b/pkgs/development/compilers/llvm/5/libc++/libc++.a new file mode 100644 index 000000000000..f676948115eb --- /dev/null +++ b/pkgs/development/compilers/llvm/5/libc++/libc++.a @@ -0,0 +1 @@ +INPUT(-lc++_static -lc++abi) diff --git a/pkgs/development/compilers/llvm/5/libc++abi.nix b/pkgs/development/compilers/llvm/5/libc++abi.nix index 69970543674c..227ecbeda194 100644 --- a/pkgs/development/compilers/llvm/5/libc++abi.nix +++ b/pkgs/development/compilers/llvm/5/libc++abi.nix @@ -33,6 +33,7 @@ stdenv.mkDerivation { '' else '' install -d -m 755 $out/include $out/lib + install -m 644 lib/libc++abi.a $out/lib install -m 644 lib/libc++abi.so.1.0 $out/lib install -m 644 ../include/cxxabi.h $out/include ln -s libc++abi.so.1.0 $out/lib/libc++abi.so diff --git a/pkgs/development/compilers/llvm/6/libc++/default.nix b/pkgs/development/compilers/llvm/6/libc++/default.nix index 3a165e9da7b1..b90b6b7b58c8 100644 --- a/pkgs/development/compilers/llvm/6/libc++/default.nix +++ b/pkgs/development/compilers/llvm/6/libc++/default.nix @@ -38,6 +38,11 @@ stdenv.mkDerivation rec { linkCxxAbi = stdenv.isLinux; + postInstall = '' + mv $out/lib/libc++.a $out/lib/libc++_static.a + cp ${./libc++.a} $out/lib/libc++.a + ''; + setupHooks = [ ../../../../../build-support/setup-hooks/role.bash ./setup-hook.sh diff --git a/pkgs/development/compilers/llvm/6/libc++/libc++.a b/pkgs/development/compilers/llvm/6/libc++/libc++.a new file mode 100644 index 000000000000..f676948115eb --- /dev/null +++ b/pkgs/development/compilers/llvm/6/libc++/libc++.a @@ -0,0 +1 @@ +INPUT(-lc++_static -lc++abi) diff --git a/pkgs/development/compilers/llvm/6/libc++abi.nix b/pkgs/development/compilers/llvm/6/libc++abi.nix index 425b00c689ef..df9c784a10f4 100644 --- a/pkgs/development/compilers/llvm/6/libc++abi.nix +++ b/pkgs/development/compilers/llvm/6/libc++abi.nix @@ -33,6 +33,7 @@ stdenv.mkDerivation { '' else '' install -d -m 755 $out/include $out/lib + install -m 644 lib/libc++abi.a $out/lib install -m 644 lib/libc++abi.so.1.0 $out/lib install -m 644 ../include/cxxabi.h $out/include ln -s libc++abi.so.1.0 $out/lib/libc++abi.so diff --git a/pkgs/development/compilers/llvm/7/libc++/default.nix b/pkgs/development/compilers/llvm/7/libc++/default.nix index 76bfb34975e6..f3b2f4df6cc6 100644 --- a/pkgs/development/compilers/llvm/7/libc++/default.nix +++ b/pkgs/development/compilers/llvm/7/libc++/default.nix @@ -36,6 +36,11 @@ stdenv.mkDerivation rec { linkCxxAbi = stdenv.isLinux; + postInstall = '' + mv $out/lib/libc++.a $out/lib/libc++_static.a + cp ${./libc++.a} $out/lib/libc++.a + ''; + setupHooks = [ ../../../../../build-support/setup-hooks/role.bash ./setup-hook.sh diff --git a/pkgs/development/compilers/llvm/7/libc++/libc++.a b/pkgs/development/compilers/llvm/7/libc++/libc++.a new file mode 100644 index 000000000000..f676948115eb --- /dev/null +++ b/pkgs/development/compilers/llvm/7/libc++/libc++.a @@ -0,0 +1 @@ +INPUT(-lc++_static -lc++abi) diff --git a/pkgs/development/compilers/llvm/7/libc++abi.nix b/pkgs/development/compilers/llvm/7/libc++abi.nix index 7dbda6c365e0..04062b83f50e 100644 --- a/pkgs/development/compilers/llvm/7/libc++abi.nix +++ b/pkgs/development/compilers/llvm/7/libc++abi.nix @@ -33,6 +33,7 @@ stdenv.mkDerivation { '' else '' install -d -m 755 $out/include $out/lib + install -m 644 lib/libc++abi.a $out/lib install -m 644 lib/libc++abi.so.1.0 $out/lib install -m 644 ../include/cxxabi.h $out/include ln -s libc++abi.so.1.0 $out/lib/libc++abi.so |