From d8699a9a5b8f98c710bc5d4e78245e3007d82985 Mon Sep 17 00:00:00 2001 From: James Kay Date: Thu, 13 Dec 2018 20:05:54 +0000 Subject: [PATCH] libcxxabi: also install libc++abi.a --- pkgs/development/compilers/llvm/4/libc++abi.nix | 1 + pkgs/development/compilers/llvm/5/libc++abi.nix | 1 + pkgs/development/compilers/llvm/6/libc++abi.nix | 1 + pkgs/development/compilers/llvm/7/libc++abi.nix | 1 + 4 files changed, 4 insertions(+) diff --git a/pkgs/development/compilers/llvm/4/libc++abi.nix b/pkgs/development/compilers/llvm/4/libc++abi.nix index 5eeec395b97..735c5e9e743 100644 --- a/pkgs/development/compilers/llvm/4/libc++abi.nix +++ b/pkgs/development/compilers/llvm/4/libc++abi.nix @@ -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 diff --git a/pkgs/development/compilers/llvm/5/libc++abi.nix b/pkgs/development/compilers/llvm/5/libc++abi.nix index 69970543674..227ecbeda19 100644 --- a/pkgs/development/compilers/llvm/5/libc++abi.nix +++ b/pkgs/development/compilers/llvm/5/libc++abi.nix @@ -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 diff --git a/pkgs/development/compilers/llvm/6/libc++abi.nix b/pkgs/development/compilers/llvm/6/libc++abi.nix index 425b00c689e..df9c784a10f 100644 --- a/pkgs/development/compilers/llvm/6/libc++abi.nix +++ b/pkgs/development/compilers/llvm/6/libc++abi.nix @@ -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 diff --git a/pkgs/development/compilers/llvm/7/libc++abi.nix b/pkgs/development/compilers/llvm/7/libc++abi.nix index 7dbda6c365e..04062b83f50 100644 --- a/pkgs/development/compilers/llvm/7/libc++abi.nix +++ b/pkgs/development/compilers/llvm/7/libc++abi.nix @@ -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