Revert "libcxx: add linker scripts for libc++.a to ensure libc++abi.a is properly linked"
This reverts commit 72e1764199
.
This causes the GHC panic reported in issue #55848.
This commit is contained in:
parent
266315c91d
commit
8cb7ea7dae
@ -44,11 +44,6 @@ stdenv.mkDerivation rec {
|
|||||||
|
|
||||||
linkCxxAbi = stdenv.isLinux;
|
linkCxxAbi = stdenv.isLinux;
|
||||||
|
|
||||||
postInstall = ''
|
|
||||||
mv $out/lib/libc++.a $out/lib/libc++_static.a
|
|
||||||
cp ${./libc++.a} $out/lib/libc++.a
|
|
||||||
'';
|
|
||||||
|
|
||||||
setupHooks = [
|
setupHooks = [
|
||||||
../../../../../build-support/setup-hooks/role.bash
|
../../../../../build-support/setup-hooks/role.bash
|
||||||
./setup-hook.sh
|
./setup-hook.sh
|
||||||
|
@ -1 +0,0 @@
|
|||||||
INPUT(-lc++_static -lc++abi)
|
|
@ -38,11 +38,6 @@ stdenv.mkDerivation rec {
|
|||||||
|
|
||||||
linkCxxAbi = stdenv.isLinux;
|
linkCxxAbi = stdenv.isLinux;
|
||||||
|
|
||||||
postInstall = ''
|
|
||||||
mv $out/lib/libc++.a $out/lib/libc++_static.a
|
|
||||||
cp ${./libc++.a} $out/lib/libc++.a
|
|
||||||
'';
|
|
||||||
|
|
||||||
setupHooks = [
|
setupHooks = [
|
||||||
../../../../../build-support/setup-hooks/role.bash
|
../../../../../build-support/setup-hooks/role.bash
|
||||||
./setup-hook.sh
|
./setup-hook.sh
|
||||||
|
@ -1 +0,0 @@
|
|||||||
INPUT(-lc++_static -lc++abi)
|
|
@ -38,11 +38,6 @@ stdenv.mkDerivation rec {
|
|||||||
|
|
||||||
linkCxxAbi = stdenv.isLinux;
|
linkCxxAbi = stdenv.isLinux;
|
||||||
|
|
||||||
postInstall = ''
|
|
||||||
mv $out/lib/libc++.a $out/lib/libc++_static.a
|
|
||||||
cp ${./libc++.a} $out/lib/libc++.a
|
|
||||||
'';
|
|
||||||
|
|
||||||
setupHooks = [
|
setupHooks = [
|
||||||
../../../../../build-support/setup-hooks/role.bash
|
../../../../../build-support/setup-hooks/role.bash
|
||||||
./setup-hook.sh
|
./setup-hook.sh
|
||||||
|
@ -1 +0,0 @@
|
|||||||
INPUT(-lc++_static -lc++abi)
|
|
@ -36,11 +36,6 @@ stdenv.mkDerivation rec {
|
|||||||
|
|
||||||
linkCxxAbi = stdenv.isLinux;
|
linkCxxAbi = stdenv.isLinux;
|
||||||
|
|
||||||
postInstall = ''
|
|
||||||
mv $out/lib/libc++.a $out/lib/libc++_static.a
|
|
||||||
cp ${./libc++.a} $out/lib/libc++.a
|
|
||||||
'';
|
|
||||||
|
|
||||||
setupHooks = [
|
setupHooks = [
|
||||||
../../../../../build-support/setup-hooks/role.bash
|
../../../../../build-support/setup-hooks/role.bash
|
||||||
./setup-hook.sh
|
./setup-hook.sh
|
||||||
|
@ -1 +0,0 @@
|
|||||||
INPUT(-lc++_static -lc++abi)
|
|
Loading…
Reference in New Issue
Block a user