Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitb7c1d98

Browse files
committed
Use SGEN if mono-sgen is available
SGEN has been solid, at least on Mono 2.10.9 and 3.0.0The 50% compiler improvement on the majority platforms (Mac, Linux) istoo important to ignore.This change makes --gc=sgen the default if mono-sgen is detected on thepath in configuration.
1 parent6ca6a1a commitb7c1d98

File tree

4 files changed

+25
-4
lines changed

4 files changed

+25
-4
lines changed

‎config.make.in‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,7 @@ monolibdir35 := $(monodir)3.5/
1717
monolibdir4 := $(monodir)4.0/
1818
tooldir := $(topdir)lib/bootstrap/4.0/
1919

20-
#Enable this fo faster bulds, but not on Mono 2.11.5, see https://bugzilla.xamarin.com/show_bug.cgi?id=7815
21-
#MONO_OPTIONS += --gc=sgen
20+
MONO_OPTIONS += @mono_gc_options@
2221

2322
CONFIG = release
2423
DISTVERSION = 201011

‎configure.ac‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ if test "x$PKG_CONFIG" = "xno"; then
1212
AC_MSG_ERROR([You need to install pkg-config])
1313
fi
1414

15+
AC_PATH_PROG(MONO_SGEN,mono-sgen,no)
16+
1517
# PKG_CHECK_MODULES([MONO], [mono >= 2.9])
1618
#
1719
# PKG_CHECK_MODULES([MONO_2_12],
@@ -55,6 +57,14 @@ if ! test -e $MONODIR/2.0/mscorlib.dll; then
5557
fi
5658
AC_SUBST(MONODIR)
5759

60+
if test "x$MONO_SGEN" = "xno"; then
61+
mono_gc_options=
62+
else
63+
mono_gc_options=--gc=sgen
64+
fi
65+
66+
AC_SUBST(mono_gc_options)
67+
5868

5969
AC_CONFIG_FILES([
6070
launcher

‎launcher.in‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,15 @@ if test x$1 = x--valgrind; then
1616
EXEC="valgrind$VALGRIND_OPTIONS"
1717
fi
1818

19+
MONO_GC_OPTIONS=@mono_gc_options@
20+
iftest x$1 = x--gc=boehm;then
21+
shift
22+
MONO_GC_OPTIONS=--gc=boehm
23+
fi
1924

20-
$EXEC mono$DEBUG$MONO_OPTIONS @DIR@/@TOOL@$@
25+
# Beware this line must match the regular expression " (\/.*)\/fsi\.exe" when @TOOL@ is fsi.exe.
26+
# That's because the FSharp MonoDevelop addin looks inside the text of this script to determine the installation
27+
# location of the default FSharp install in order to find the FSharp compiler binaries (see
28+
# fsharpbinding/MonoDevelop.FSharpBinding/Services/CompilerLocationUtils.fs). That's a pretty unfortunate
29+
# way of finding those binaries. And really should be changed.
30+
$EXEC mono$DEBUG$MONO_OPTIONS$MONO_GC_OPTIONS @DIR@/@TOOL@$@

‎src/fsharp/Makefile.in‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,9 @@ do-final:
2323
$(MAKE) -C policy.2.0.FSharp.Core$@
2424
$(MAKE) -C policy.4.0.FSharp.Core$@
2525

26-
install: do-final
26+
install:
27+
$(MAKE) do-proto
28+
$(MAKE) do-final
2729
$(MAKE) -C FSharp.Core$@
2830
$(MAKE) -C FSharp.Build$@
2931
$(MAKE) -C FSharp.Compiler$@

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp