public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #56030 from matthewbauer/revert-72e176

Browse Source 
Revert "libcxx: add linker scripts for libc++.a to ensure libc++abi.a…
This commit is contained in:
Matthew Bauer 2019-02-19 11:45:37 -05:00 committed by GitHub
commit 5d0b0bbf30
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 0 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/development/compilers/llvm/4/libc++/default.nix
View File

@ -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
pkgs/development/compilers/llvm/4/libc++/libc++.a
View File

@ -1 +0,0 @@
INPUT(-lc++_static -lc++abi)

5
pkgs/development/compilers/llvm/5/libc++/default.nix
View File

@ -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
pkgs/development/compilers/llvm/5/libc++/libc++.a
View File

@ -1 +0,0 @@
INPUT(-lc++_static -lc++abi)

5
pkgs/development/compilers/llvm/6/libc++/default.nix
View File

@ -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
pkgs/development/compilers/llvm/6/libc++/libc++.a
View File

@ -1 +0,0 @@
INPUT(-lc++_static -lc++abi)

5
pkgs/development/compilers/llvm/7/libc++/default.nix
View File

@ -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
pkgs/development/compilers/llvm/7/libc++/libc++.a
View File

@ -1 +0,0 @@
INPUT(-lc++_static -lc++abi)