diff options
| author | Will Dietz <w@wdtz.org> | 2018-06-23 11:55:48 -0500 |
|---|---|---|
| committer | Will Dietz <w@wdtz.org> | 2018-06-23 15:53:44 -0500 |
| commit | ebcdd8b9b01afa9bbe57d432a00063a008c5f1e6 (patch) | |
| tree | b39460021418809016b88664013bd446926fefc0 /pkgs/development/compilers/llvm | |
| parent | 68351290ad701dd655311a9fb557266993362d00 (diff) | |
| download | nixlib-ebcdd8b9b01afa9bbe57d432a00063a008c5f1e6.tar nixlib-ebcdd8b9b01afa9bbe57d432a00063a008c5f1e6.tar.gz nixlib-ebcdd8b9b01afa9bbe57d432a00063a008c5f1e6.tar.bz2 nixlib-ebcdd8b9b01afa9bbe57d432a00063a008c5f1e6.tar.lz nixlib-ebcdd8b9b01afa9bbe57d432a00063a008c5f1e6.tar.xz nixlib-ebcdd8b9b01afa9bbe57d432a00063a008c5f1e6.tar.zst nixlib-ebcdd8b9b01afa9bbe57d432a00063a008c5f1e6.zip | |
llvm_4: refactor patch location, will be sharing shortly
Diffstat (limited to 'pkgs/development/compilers/llvm')
| -rw-r--r-- | pkgs/development/compilers/llvm/4/libc++/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/compilers/llvm/4/libc++abi.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/compilers/llvm/libcxx-max_align_t.patch (renamed from pkgs/development/compilers/llvm/4/libc++/max_align_t.patch) | 0 |
3 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/compilers/llvm/4/libc++/default.nix b/pkgs/development/compilers/llvm/4/libc++/default.nix index 718abc420a97..6ce9c0d4792b 100644 --- a/pkgs/development/compilers/llvm/4/libc++/default.nix +++ b/pkgs/development/compilers/llvm/4/libc++/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { ./xlocale-glibc-2.26.patch ] ++ stdenv.lib.optionals stdenv.hostPlatform.isMusl [ ../../libcxx-0001-musl-hacks.patch - ./max_align_t.patch + ../../libcxx-max_align_t.patch ]; prePatch = '' diff --git a/pkgs/development/compilers/llvm/4/libc++abi.nix b/pkgs/development/compilers/llvm/4/libc++abi.nix index 41eb40e124eb..5eeec395b97a 100644 --- a/pkgs/development/compilers/llvm/4/libc++abi.nix +++ b/pkgs/development/compilers/llvm/4/libc++abi.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { export TRIPLE=x86_64-apple-darwin '' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl '' patch -p1 -d $(ls -d libcxx-*) -i ${../libcxx-0001-musl-hacks.patch} - patch -p1 -d $(ls -d libcxx-*) -i ${./libc++/max_align_t.patch} + patch -p1 -d $(ls -d libcxx-*) -i ${../libcxx-max_align_t.patch} ''; installPhase = if stdenv.isDarwin diff --git a/pkgs/development/compilers/llvm/4/libc++/max_align_t.patch b/pkgs/development/compilers/llvm/libcxx-max_align_t.patch index 060be5b23de8..060be5b23de8 100644 --- a/pkgs/development/compilers/llvm/4/libc++/max_align_t.patch +++ b/pkgs/development/compilers/llvm/libcxx-max_align_t.patch |