Skip to content

Commit

Permalink
Infrastructure support / fixes for making compiler server the default (
Browse files Browse the repository at this point in the history
…mono/mono#14279)

* Fix enabling the compiler server using autogen, and force it off if mcs is being used

* autogen updates

* Formatting fixes

* Fix vbcs getting turned on if unspecified even if mcs was selected

* Dynamically evaluate ENABLE_COMPILER_SERVER each time we compile instead of evaluating it once at some arbitrary point during makefile evaluation

* More detailed comment based on testing

* Handle the /shared option in genproj so it doesn't fail

* Raise basic profile check requirement to 6.2 and hopefully assert that named pipes work

* Default compiler server to off for now.


Commit migrated from mono/mono@add2a21
  • Loading branch information
kg authored May 29, 2019
1 parent 0844b3b commit f061614
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 1 deletion.
23 changes: 22 additions & 1 deletion src/mono/configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -6529,6 +6529,26 @@ if test x$host_darwin = xyes; then
sed -e 's,lock_old_archive_extraction=yes,lock_old_archive_extraction=no,g' < libtool > libtool.new && mv libtool.new libtool && chmod +x libtool
fi

AC_MSG_CHECKING([compiler server])
AC_ARG_WITH(compiler-server, [ --with-compiler-server=yes,no,default Enables or disables compiler server],[
if test x$withval = xyes; then
enable_compiler_server=yes;
elif test x$withval = xno; then
enable_compiler_server=no;
elif test x$withval = xdefault; then
enable_compiler_server=no;
else
AC_MSG_ERROR([You must supply one of "yes", "no" or "default" to the --with-compiler-server option])
fi
],[enable_compiler_server=no])

if test x$enable_compiler_server = xyes; then
if test x$csc_compiler = xmcs; then
AC_MSG_WARN([mcs does not support the compiler server])
enable_compiler_server=no;
fi
fi

(
case $prefix in
NONE) prefix=$ac_default_prefix ;;
Expand Down Expand Up @@ -6699,8 +6719,9 @@ if test x$buildsgen = xyes; then
fi

echo "
mcs source: $mcsdir
mcs source: $mcsdir
C# Compiler: $csc_compiler
CompilerServer:$enable_compiler_server

Engine:
Host: $host
Expand Down
3 changes: 3 additions & 0 deletions src/mono/msvc/scripts/genproj.cs
Original file line number Diff line number Diff line change
Expand Up @@ -716,6 +716,9 @@ bool CSCParseOption (string option, ref string [] args)

case "/sourcelink":
return true;

case "/shared":
return true;
}

Console.Error.WriteLine ($"// Failing with : {arg}");
Expand Down

0 comments on commit f061614

Please sign in to comment.