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

Merge remote-tracking branch 'upstream/master' into mingw-mcfthreads

Browse Source
This commit is contained in:
John Ericson
2019-11-11 20:48:14 -05:00
parent 63eac67319 e3b76760e3
commit 16f0fe7fe3
4983 changed files with 152349 additions and 86073 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/libraries/boehm-gc/default.nix
+3 -5
View File
@@ -16,22 +16,20 @@ stdenv.mkDerivation rec {
};
outputs = [ "out" "dev" "doc" ];
separateDebugInfo = stdenv.isLinux;
separateDebugInfo = stdenv.isLinux && 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"
'';
patches =
# https://github.com/ivmai/bdwgc/pull/208
patches = # https://github.com/ivmai/bdwgc/pull/208
lib.optional stdenv.hostPlatform.isRiscV ./riscv.patch
# boehm-gc whitelists GCC threading models
++ lib.optional stdenv.hostPlatform.isMinGW ./mcfgthread.patch;
configureFlags =
[ "--enable-cplusplus" "--with-libatomic-ops=none" ]
++ lib.optional enableLargeConfig "--enable-large-config"
++ lib.optional (stdenv.hostPlatform.libc == "musl") "--disable-static";
++ lib.optional enableLargeConfig "--enable-large-config";
nativeBuildInputs =
lib.optional stdenv.hostPlatform.isMinGW autoreconfHook;