You've already forked linux-packaging-mono
Imported Upstream version 6.6.0.89
Former-commit-id: b39a328747c2f3414dc52e009fb6f0aa80ca2492
This commit is contained in:
parent
cf815e07e0
commit
95fdb59ea6
@@ -49,6 +49,7 @@ DISTFILES = \
|
||||
library.make \
|
||||
rules.make \
|
||||
tests.make \
|
||||
start-compiler-server.sh \
|
||||
$(COMMON_SRCS:%=common/%) \
|
||||
$(PLATFORMS:%=platforms/%.make) $(PROFILES:%=profiles/%.make)
|
||||
|
||||
|
||||
@@ -30,7 +30,7 @@
|
||||
|
||||
static partial class Consts
|
||||
{
|
||||
public const string MonoCorlibVersion = "62731146-81CF-4D61-826D-9A8DDED14432";
|
||||
public const string MonoCorlibVersion = "2cfaeda3-94a9-44e5-8fcb-51979a3398c9";
|
||||
}
|
||||
|
||||
#if !NETCORE
|
||||
@@ -41,7 +41,7 @@ static partial class Consts
|
||||
// Use these assembly version constants to make code more maintainable.
|
||||
//
|
||||
|
||||
public const string MonoVersion = "6.4.0.199";
|
||||
public const string MonoVersion = "6.6.0.89";
|
||||
public const string MonoCompany = "Mono development team";
|
||||
public const string MonoProduct = "Mono Common Language Infrastructure";
|
||||
public const string MonoCopyright = "(c) Various Mono authors";
|
||||
|
||||
@@ -41,9 +41,9 @@ class X
|
||||
|
||||
Version min_mono_version;
|
||||
#if __MonoCS__
|
||||
min_mono_version = new Version (6, 2);
|
||||
min_mono_version = new Version (6, 5);
|
||||
#else
|
||||
min_mono_version = new Version (6, 2);
|
||||
min_mono_version = new Version (6, 5);
|
||||
#endif
|
||||
|
||||
if (version < min_mono_version)
|
||||
|
||||
@@ -45,7 +45,7 @@ USE_MCS_FLAGS = $(COMPILER_SERVER_ARGS) /codepage:$(CODEPAGE) /nologo /noconfig
|
||||
USE_MBAS_FLAGS = $(COMPILER_SERVER_ARGS) /codepage:$(CODEPAGE) $(LOCAL_MBAS_FLAGS) $(PLATFORM_MBAS_FLAGS) $(PROFILE_MBAS_FLAGS) $(MBAS_FLAGS)
|
||||
USE_CFLAGS = $(LOCAL_CFLAGS) $(CFLAGS) $(CPPFLAGS)
|
||||
CSCOMPILE = $(Q_MCS) $(MCS) $(USE_MCS_FLAGS)
|
||||
CSC_RUNTIME_FLAGS = --aot-path=$(abspath $(topdir)/class/lib/$(BUILD_TOOLS_PROFILE)) --gc-params=nursery-size=64m
|
||||
CSC_RUNTIME_FLAGS = --aot-path=$(abspath $(topdir)/class/lib/$(BUILD_TOOLS_PROFILE)) --gc-params=nursery-size=64m --clr-memory-model
|
||||
BASCOMPILE = $(MBAS) $(USE_MBAS_FLAGS)
|
||||
CCOMPILE = $(CC) $(USE_CFLAGS)
|
||||
BOOT_COMPILE = $(Q_MCS) $(BOOTSTRAP_MCS) $(USE_MCS_FLAGS)
|
||||
|
||||
25
mcs/build/start-compiler-server.sh
Executable file
25
mcs/build/start-compiler-server.sh
Executable file
@@ -0,0 +1,25 @@
|
||||
#!/usr/bin/env bash
|
||||
# usage: start-compiler-server.sh <working directory> <log path> <pipename>
|
||||
# ensure that VBCS_RUNTIME and VBCS_LOCATION environment variables are set.
|
||||
|
||||
set -u
|
||||
set -e
|
||||
|
||||
if [ -s "$VBCS_LOCATION" ]; then
|
||||
CMD="RoslynCommandLineLogFile=$2 $VBCS_RUNTIME --clr-memory-model --gc-params=nursery-size=64m \"$VBCS_LOCATION\" -pipename:$3 &"
|
||||
echo "Log location set to $2"
|
||||
touch "$2"
|
||||
echo "cd $1; bash -c \"$CMD\""
|
||||
cd "$1"
|
||||
bash -c "$CMD"
|
||||
RESULT=$?
|
||||
if [ $RESULT -eq 0 ]; then
|
||||
echo Compiler server started.
|
||||
else
|
||||
echo Failed to start compiler server.
|
||||
fi;
|
||||
else
|
||||
echo No compiler server found at path "$VBCS_LOCATION". Ensure that VBCS_LOCATION is set in config.make or passed as a parameter to make.
|
||||
echo Use ENABLE_COMPILER_SERVER=0 to disable the use of the compiler server and continue to build.
|
||||
exit 1
|
||||
fi;
|
||||
Reference in New Issue
Block a user