public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

llvm_4: refactor patch location, will be sharing shortly

Browse Source
This commit is contained in:
Will Dietz 2018-06-23 11:55:48 -05:00
parent 68351290ad
commit ebcdd8b9b0
3 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/compilers/llvm/4/libc++/default.nix
View File

@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
./xlocale-glibc-2.26.patch ./xlocale-glibc-2.26.patch
] ++ stdenv.lib.optionals stdenv.hostPlatform.isMusl [ ] ++ stdenv.lib.optionals stdenv.hostPlatform.isMusl [
../../libcxx-0001-musl-hacks.patch ../../libcxx-0001-musl-hacks.patch
./max_align_t.patch ../../libcxx-max_align_t.patch
]; ];
prePatch = '' prePatch = ''

2
pkgs/development/compilers/llvm/4/libc++abi.nix
View File

@ -16,7 +16,7 @@ stdenv.mkDerivation {
export TRIPLE=x86_64-apple-darwin export TRIPLE=x86_64-apple-darwin
'' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl '' '' + 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 ${../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 installPhase = if stdenv.isDarwin

0
pkgs/development/compilers/llvm/4/libc++/max_align_t.patch → pkgs/development/compilers/llvm/libcxx-max_align_t.patch
View File