diff options
| author | John Ericson <subscribe@JohnEricson.me> | 2018-09-25 00:04:52 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-25 00:04:52 -0400 |
| commit | 2b4b7d4ef3bba661fbafbced814a8b39c65ea81a (patch) | |
| tree | b1fc6b9d9fd9227922f98ed05abc27e04fec32dd /pkgs/development/compilers/llvm | |
| parent | b1d518206a65e99b9b4b79fa2b10162a9d8e4486 (diff) | |
| parent | 87c02060383a689e81749643a39dbcc3c4fc6ad1 (diff) | |
| download | nixlib-2b4b7d4ef3bba661fbafbced814a8b39c65ea81a.tar nixlib-2b4b7d4ef3bba661fbafbced814a8b39c65ea81a.tar.gz nixlib-2b4b7d4ef3bba661fbafbced814a8b39c65ea81a.tar.bz2 nixlib-2b4b7d4ef3bba661fbafbced814a8b39c65ea81a.tar.lz nixlib-2b4b7d4ef3bba661fbafbced814a8b39c65ea81a.tar.xz nixlib-2b4b7d4ef3bba661fbafbced814a8b39c65ea81a.tar.zst nixlib-2b4b7d4ef3bba661fbafbced814a8b39c65ea81a.zip | |
Merge pull request #47233 from oxij/tree/mass-rebuild-noop-cleanups
treewide: mass rebuild noop cleanups
Diffstat (limited to 'pkgs/development/compilers/llvm')
| -rw-r--r-- | pkgs/development/compilers/llvm/5/libc++/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/development/compilers/llvm/6/libc++/default.nix | 6 |
2 files changed, 4 insertions, 8 deletions
diff --git a/pkgs/development/compilers/llvm/5/libc++/default.nix b/pkgs/development/compilers/llvm/5/libc++/default.nix index c7b4615e374a..b182f1250e72 100644 --- a/pkgs/development/compilers/llvm/5/libc++/default.nix +++ b/pkgs/development/compilers/llvm/5/libc++/default.nix @@ -10,11 +10,9 @@ stdenv.mkDerivation rec { export LIBCXXABI_INCLUDE_DIR="$PWD/$(ls -d libcxxabi-${version}*)/include" ''; - # on next rebuild, this can be replaced with optionals; for now set to null to avoid - # patches = stdenv.lib.optionals stdenv.hostPlatform.isMusl [ - patches = if stdenv.hostPlatform.isMusl then [ + patches = stdenv.lib.optionals stdenv.hostPlatform.isMusl [ ../../libcxx-0001-musl-hacks.patch - ] else null; + ]; prePatch = '' substituteInPlace lib/CMakeLists.txt --replace "/usr/lib/libc++" "\''${LIBCXX_LIBCXXABI_LIB_PATH}/libc++" diff --git a/pkgs/development/compilers/llvm/6/libc++/default.nix b/pkgs/development/compilers/llvm/6/libc++/default.nix index 1f87cb83ab01..3a165e9da7b1 100644 --- a/pkgs/development/compilers/llvm/6/libc++/default.nix +++ b/pkgs/development/compilers/llvm/6/libc++/default.nix @@ -10,11 +10,9 @@ stdenv.mkDerivation rec { export LIBCXXABI_INCLUDE_DIR="$PWD/$(ls -d libcxxabi-${version}*)/include" ''; - # on next rebuild, this can be replaced with optionals; for now set to null to avoid - # patches = stdenv.lib.optionals stdenv.hostPlatform.isMusl [ - patches = if stdenv.hostPlatform.isMusl then [ + patches = stdenv.lib.optionals stdenv.hostPlatform.isMusl [ ../../libcxx-0001-musl-hacks.patch - ] else null; + ]; prePatch = '' substituteInPlace lib/CMakeLists.txt --replace "/usr/lib/libc++" "\''${LIBCXX_LIBCXXABI_LIB_PATH}/libc++" |