Revert "libcxx: add linker scripts for libc++.a to ensure libc++abi.a…

… is properly linked" This reverts commit 72e1764. This causes the GHC panic reported in issue NixOS#55848.
matthewbauer · Feb 19, 2019 · 8cb7ea7 · 8cb7ea7
1 parent 266315c
commit 8cb7ea7
Show file tree

Hide file tree

Showing 8 changed files with 0 additions and 24 deletions.
diff --git a/pkgs/development/compilers/llvm/4/libc++/default.nix b/pkgs/development/compilers/llvm/4/libc++/default.nix
@@ -44,11 +44,6 @@ 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
diff --git a/pkgs/development/compilers/llvm/5/libc++/default.nix b/pkgs/development/compilers/llvm/5/libc++/default.nix
@@ -38,11 +38,6 @@ 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
diff --git a/pkgs/development/compilers/llvm/6/libc++/default.nix b/pkgs/development/compilers/llvm/6/libc++/default.nix
@@ -38,11 +38,6 @@ 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
diff --git a/pkgs/development/compilers/llvm/7/libc++/default.nix b/pkgs/development/compilers/llvm/7/libc++/default.nix
@@ -36,11 +36,6 @@ 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