From 8cb7ea7daebcef9c66e5bd4dda3ed7b18b178f03 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Mon, 18 Feb 2019 20:51:18 -0500
Subject: [PATCH] Revert "libcxx: add linker scripts for libc++.a to ensure
 libc++abi.a is properly linked"

This reverts commit 72e1764199805ab6e602fa3762a4d95bfdf80cb8.

This causes the GHC panic reported in issue #55848.
---
 pkgs/development/compilers/llvm/4/libc++/default.nix | 5 -----
 pkgs/development/compilers/llvm/4/libc++/libc++.a    | 1 -
 pkgs/development/compilers/llvm/5/libc++/default.nix | 5 -----
 pkgs/development/compilers/llvm/5/libc++/libc++.a    | 1 -
 pkgs/development/compilers/llvm/6/libc++/default.nix | 5 -----
 pkgs/development/compilers/llvm/6/libc++/libc++.a    | 1 -
 pkgs/development/compilers/llvm/7/libc++/default.nix | 5 -----
 pkgs/development/compilers/llvm/7/libc++/libc++.a    | 1 -
 8 files changed, 24 deletions(-)
 delete mode 100644 pkgs/development/compilers/llvm/4/libc++/libc++.a
 delete mode 100644 pkgs/development/compilers/llvm/5/libc++/libc++.a
 delete mode 100644 pkgs/development/compilers/llvm/6/libc++/libc++.a
 delete mode 100644 pkgs/development/compilers/llvm/7/libc++/libc++.a

diff --git a/pkgs/development/compilers/llvm/4/libc++/default.nix b/pkgs/development/compilers/llvm/4/libc++/default.nix
index 6344304b84bf8..2b543b9d793ab 100644
--- 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
deleted file mode 100644
index f676948115ebe..0000000000000
--- a/pkgs/development/compilers/llvm/4/libc++/libc++.a
+++ /dev/null
@@ -1 +0,0 @@
-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 6dc81e10163f5..b182f1250e724 100644
--- 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
deleted file mode 100644
index f676948115ebe..0000000000000
--- a/pkgs/development/compilers/llvm/5/libc++/libc++.a
+++ /dev/null
@@ -1 +0,0 @@
-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 b90b6b7b58c89..3a165e9da7b1b 100644
--- 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
deleted file mode 100644
index f676948115ebe..0000000000000
--- a/pkgs/development/compilers/llvm/6/libc++/libc++.a
+++ /dev/null
@@ -1 +0,0 @@
-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 8a13f3eb59034..d372984dac7cf 100644
--- 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
deleted file mode 100644
index f676948115ebe..0000000000000
--- a/pkgs/development/compilers/llvm/7/libc++/libc++.a
+++ /dev/null
@@ -1 +0,0 @@
-INPUT(-lc++_static -lc++abi)