diff options
| author | Zoltan Varga <vargaz@gmail.com> | 2019-06-28 03:44:39 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-28 03:44:39 +0300 |
| commit | 064d367ede1cbfc760e63667b0c4bad128f19914 (patch) | |
| tree | ed03314779d6c8726aa0c7bf225b607cac1154e1 /mcs/build | |
| parent | c5ef80bf861602300262231d9f690ed03a305b90 (diff) | |
Pass the --clr-memory-model flag on the command line instead of MONO_DEBUG so its not inherited by child processes. (#15447)
Diffstat (limited to 'mcs/build')
| -rw-r--r-- | mcs/build/rules.make | 6 | ||||
| -rwxr-xr-x | mcs/build/start-compiler-server.sh | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/mcs/build/rules.make b/mcs/build/rules.make index b8a1499a903..a77f1d11cc6 100644 --- a/mcs/build/rules.make +++ b/mcs/build/rules.make @@ -45,10 +45,10 @@ 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) MONO_DEBUG=clr-memory-model $(BOOTSTRAP_MCS) $(USE_MCS_FLAGS) +BOOT_COMPILE = $(Q_MCS) $(BOOTSTRAP_MCS) $(USE_MCS_FLAGS) INSTALL = $(SHELL) $(topdir)/../mono/install-sh INSTALL_DATA = $(INSTALL) -c -m 644 INSTALL_BIN = $(INSTALL) -c -m 755 @@ -58,7 +58,7 @@ INTERNAL_MBAS = $(RUNTIME) $(RUNTIME_FLAGS) $(topdir)/mbas/mbas.exe INTERNAL_CSC_LOCATION = $(CSC_LOCATION) # Using CSC_SDK_PATH_DISABLED for sanity check that all references have path specified -INTERNAL_CSC = CSC_SDK_PATH_DISABLED= MONO_DEBUG=clr-memory-model $(RUNTIME) $(RUNTIME_FLAGS) $(CSC_RUNTIME_FLAGS) $(INTERNAL_CSC_LOCATION) +INTERNAL_CSC = CSC_SDK_PATH_DISABLED= $(RUNTIME) $(RUNTIME_FLAGS) $(CSC_RUNTIME_FLAGS) $(INTERNAL_CSC_LOCATION) RESGEN = MONO_PATH="$(topdir)/class/lib/$(BUILD_TOOLS_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(RUNTIME) $(RUNTIME_FLAGS) $(topdir)/class/lib/$(BUILD_TOOLS_PROFILE)/resgen.exe STRING_REPLACER = MONO_PATH="$(topdir)/class/lib/$(BUILD_TOOLS_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(RUNTIME) $(RUNTIME_FLAGS) $(topdir)/class/lib/$(BUILD_TOOLS_PROFILE)/cil-stringreplacer.exe diff --git a/mcs/build/start-compiler-server.sh b/mcs/build/start-compiler-server.sh index 3e2c696c95f..b7397e9df86 100755 --- a/mcs/build/start-compiler-server.sh +++ b/mcs/build/start-compiler-server.sh @@ -6,7 +6,7 @@ set -u set -e if [ -s "$VBCS_LOCATION" ]; then - CMD="RoslynCommandLineLogFile=$2 MONO_DEBUG=clr-memory-model $VBCS_RUNTIME --gc-params=nursery-size=64m \"$VBCS_LOCATION\" -pipename:$3 &" + 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\"" |