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/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/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/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)