Merge pull request #51960 from Twey/libc++abi.a
libcxxabi: also install libc++abi.a
This commit is contained in:
commit
f10a7a216c
@ -44,6 +44,11 @@ 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
pkgs/development/compilers/llvm/4/libc++/libc++.a
Normal file
1
pkgs/development/compilers/llvm/4/libc++/libc++.a
Normal file
@ -0,0 +1 @@
|
||||
INPUT(-lc++_static -lc++abi)
|
@ -34,6 +34,7 @@ stdenv.mkDerivation {
|
||||
''
|
||||
else ''
|
||||
install -d -m 755 $out/include $out/lib
|
||||
install -m 644 lib/libc++abi.a $out/lib
|
||||
install -m 644 lib/libc++abi.so.1.0 $out/lib
|
||||
install -m 644 ../include/cxxabi.h $out/include
|
||||
ln -s libc++abi.so.1.0 $out/lib/libc++abi.so
|
||||
|
@ -38,6 +38,11 @@ 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
pkgs/development/compilers/llvm/5/libc++/libc++.a
Normal file
1
pkgs/development/compilers/llvm/5/libc++/libc++.a
Normal file
@ -0,0 +1 @@
|
||||
INPUT(-lc++_static -lc++abi)
|
@ -33,6 +33,7 @@ stdenv.mkDerivation {
|
||||
''
|
||||
else ''
|
||||
install -d -m 755 $out/include $out/lib
|
||||
install -m 644 lib/libc++abi.a $out/lib
|
||||
install -m 644 lib/libc++abi.so.1.0 $out/lib
|
||||
install -m 644 ../include/cxxabi.h $out/include
|
||||
ln -s libc++abi.so.1.0 $out/lib/libc++abi.so
|
||||
|
@ -38,6 +38,11 @@ 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
pkgs/development/compilers/llvm/6/libc++/libc++.a
Normal file
1
pkgs/development/compilers/llvm/6/libc++/libc++.a
Normal file
@ -0,0 +1 @@
|
||||
INPUT(-lc++_static -lc++abi)
|
@ -33,6 +33,7 @@ stdenv.mkDerivation {
|
||||
''
|
||||
else ''
|
||||
install -d -m 755 $out/include $out/lib
|
||||
install -m 644 lib/libc++abi.a $out/lib
|
||||
install -m 644 lib/libc++abi.so.1.0 $out/lib
|
||||
install -m 644 ../include/cxxabi.h $out/include
|
||||
ln -s libc++abi.so.1.0 $out/lib/libc++abi.so
|
||||
|
@ -36,6 +36,11 @@ 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
pkgs/development/compilers/llvm/7/libc++/libc++.a
Normal file
1
pkgs/development/compilers/llvm/7/libc++/libc++.a
Normal file
@ -0,0 +1 @@
|
||||
INPUT(-lc++_static -lc++abi)
|
@ -33,6 +33,7 @@ stdenv.mkDerivation {
|
||||
''
|
||||
else ''
|
||||
install -d -m 755 $out/include $out/lib
|
||||
install -m 644 lib/libc++abi.a $out/lib
|
||||
install -m 644 lib/libc++abi.so.1.0 $out/lib
|
||||
install -m 644 ../include/cxxabi.h $out/include
|
||||
ln -s libc++abi.so.1.0 $out/lib/libc++abi.so
|
||||
|
Loading…
x
Reference in New Issue
Block a user