Make --enable-gc the default
This commit is contained in:
parent
d823381c0a
commit
b874272f7a
3 changed files with 3 additions and 7 deletions
|
@ -255,8 +255,8 @@ fi
|
||||||
|
|
||||||
# Whether to use the Boehm garbage collector.
|
# Whether to use the Boehm garbage collector.
|
||||||
AC_ARG_ENABLE(gc, AC_HELP_STRING([--enable-gc],
|
AC_ARG_ENABLE(gc, AC_HELP_STRING([--enable-gc],
|
||||||
[enable garbage collection in the Nix expression evaluator (requires Boehm GC) [default=no]]),
|
[enable garbage collection in the Nix expression evaluator (requires Boehm GC) [default=yes]]),
|
||||||
gc=$enableval, gc=no)
|
gc=$enableval, gc=yes)
|
||||||
if test "$gc" = yes; then
|
if test "$gc" = yes; then
|
||||||
PKG_CHECK_MODULES([BDW_GC], [bdw-gc])
|
PKG_CHECK_MODULES([BDW_GC], [bdw-gc])
|
||||||
CXXFLAGS="$BDW_GC_CFLAGS $CXXFLAGS"
|
CXXFLAGS="$BDW_GC_CFLAGS $CXXFLAGS"
|
||||||
|
|
|
@ -30,9 +30,7 @@ rec {
|
||||||
});
|
});
|
||||||
|
|
||||||
configureFlags =
|
configureFlags =
|
||||||
[
|
lib.optionals stdenv.isLinux [
|
||||||
"--enable-gc"
|
|
||||||
] ++ lib.optionals stdenv.isLinux [
|
|
||||||
"--with-sandbox-shell=${sh}/bin/busybox"
|
"--with-sandbox-shell=${sh}/bin/busybox"
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|
|
@ -25,8 +25,6 @@ let
|
||||||
|
|
||||||
buildInputs = tarballDeps ++ buildDeps;
|
buildInputs = tarballDeps ++ buildDeps;
|
||||||
|
|
||||||
configureFlags = "--enable-gc";
|
|
||||||
|
|
||||||
postUnpack = ''
|
postUnpack = ''
|
||||||
(cd $sourceRoot && find . -type f) | cut -c3- > $sourceRoot/.dist-files
|
(cd $sourceRoot && find . -type f) | cut -c3- > $sourceRoot/.dist-files
|
||||||
cat $sourceRoot/.dist-files
|
cat $sourceRoot/.dist-files
|
||||||
|
|
Loading…
Reference in a new issue