Merge pull request #55133 from dtzWill/fix/bdwgc-musl-cflags-space

boehmgc{,_766}: add space before appending to CFLAGS (only done w/musl)
This commit is contained in:
Will Dietz 2019-02-12 10:04:21 -06:00 committed by GitHub
commit 92a54bd927
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions

View File

@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
separateDebugInfo = stdenv.isLinux; separateDebugInfo = stdenv.isLinux;
preConfigure = stdenv.lib.optionalString (stdenv.hostPlatform.libc == "musl") '' preConfigure = stdenv.lib.optionalString (stdenv.hostPlatform.libc == "musl") ''
export NIX_CFLAGS_COMPILE+="-D_GNU_SOURCE -DUSE_MMAP -DHAVE_DL_ITERATE_PHDR" export NIX_CFLAGS_COMPILE+=" -D_GNU_SOURCE -DUSE_MMAP -DHAVE_DL_ITERATE_PHDR"
''; '';
patches = [ (fetchpatch { patches = [ (fetchpatch {

View File

@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
separateDebugInfo = stdenv.isLinux; separateDebugInfo = stdenv.isLinux;
preConfigure = stdenv.lib.optionalString (stdenv.hostPlatform.libc == "musl") '' preConfigure = stdenv.lib.optionalString (stdenv.hostPlatform.libc == "musl") ''
export NIX_CFLAGS_COMPILE+="-D_GNU_SOURCE -DUSE_MMAP -DHAVE_DL_ITERATE_PHDR" export NIX_CFLAGS_COMPILE+=" -D_GNU_SOURCE -DUSE_MMAP -DHAVE_DL_ITERATE_PHDR"
''; '';
patches = [ (fetchpatch { patches = [ (fetchpatch {