boehm-gc: Fix build on MinGW with mcfgthreads
CC @lhmouse
This commit is contained in:
parent
89ec69e25e
commit
e00237e790
@ -1,4 +1,5 @@
|
|||||||
{ lib, stdenv, fetchurl
|
{ lib, stdenv, fetchurl
|
||||||
|
, autoreconfHook
|
||||||
, enableLargeConfig ? false # doc: https://github.com/ivmai/bdwgc/blob/v7.6.6/doc/README.macros#L179
|
, enableLargeConfig ? false # doc: https://github.com/ivmai/bdwgc/blob/v7.6.6/doc/README.macros#L179
|
||||||
}:
|
}:
|
||||||
|
|
||||||
@ -23,13 +24,18 @@ stdenv.mkDerivation rec {
|
|||||||
|
|
||||||
patches =
|
patches =
|
||||||
# https://github.com/ivmai/bdwgc/pull/208
|
# https://github.com/ivmai/bdwgc/pull/208
|
||||||
lib.optional stdenv.hostPlatform.isRiscV ./riscv.patch;
|
lib.optional stdenv.hostPlatform.isRiscV ./riscv.patch
|
||||||
|
# boehm-gc whitelists GCC threading models
|
||||||
|
++ lib.optional stdenv.hostPlatform.isMinGW ./mcfgthread.patch;
|
||||||
|
|
||||||
configureFlags =
|
configureFlags =
|
||||||
[ "--enable-cplusplus" "--with-libatomic-ops=none" ]
|
[ "--enable-cplusplus" "--with-libatomic-ops=none" ]
|
||||||
++ lib.optional enableLargeConfig "--enable-large-config"
|
++ lib.optional enableLargeConfig "--enable-large-config"
|
||||||
++ lib.optional (stdenv.hostPlatform.libc == "musl") "--disable-static";
|
++ lib.optional (stdenv.hostPlatform.libc == "musl") "--disable-static";
|
||||||
|
|
||||||
|
nativeBuildInputs =
|
||||||
|
lib.optional stdenv.hostPlatform.isMinGW autoreconfHook;
|
||||||
|
|
||||||
doCheck = true; # not cross;
|
doCheck = true; # not cross;
|
||||||
|
|
||||||
enableParallelBuilding = true;
|
enableParallelBuilding = true;
|
||||||
|
11
pkgs/development/libraries/boehm-gc/mcfgthread.patch
Normal file
11
pkgs/development/libraries/boehm-gc/mcfgthread.patch
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
--- a/configure.ac
|
||||||
|
+++ b/configure.ac
|
||||||
|
@@ -277,7 +277,7 @@ case "$THREADS" in
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
;;
|
||||||
|
- win32)
|
||||||
|
+ win32 | mcf)
|
||||||
|
AC_DEFINE(GC_THREADS)
|
||||||
|
use_parallel_mark=$enable_parallel_mark
|
||||||
|
if test "${enable_parallel_mark}" != no \
|
Loading…
x
Reference in New Issue
Block a user