Merge pull request #51960 from Twey/libc++abi.a

libcxxabi: also install libc++abi.a
This commit is contained in:
Frederik Rietdijk 2018-12-19 09:17:09 +01:00 committed by GitHub
commit f10a7a216c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
12 changed files with 28 additions and 0 deletions

View File

@ -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

View File

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

View File

@ -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

View File

@ -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

View File

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

View File

@ -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

View File

@ -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

View File

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

View File

@ -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

View File

@ -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

View File

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

View File

@ -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