Merge pull request #56030 from matthewbauer/revert-72e176
Revert "libcxx: add linker scripts for libc++.a to ensure libc++abi.a…
This commit is contained in:
commit
5d0b0bbf30
@ -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
|
||||
|
@ -1 +0,0 @@
|
||||
INPUT(-lc++_static -lc++abi)
|
@ -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
|
||||
|
@ -1 +0,0 @@
|
||||
INPUT(-lc++_static -lc++abi)
|
@ -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
|
||||
|
@ -1 +0,0 @@
|
||||
INPUT(-lc++_static -lc++abi)
|
@ -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
|
||||
|
@ -1 +0,0 @@
|
||||
INPUT(-lc++_static -lc++abi)
|
Loading…
Reference in New Issue
Block a user