diff options
author | Jay Krell <jay.krell@cornell.edu> | 2018-09-11 22:24:01 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-09-11 22:24:01 +0300 |
commit | f32cca7b6dfef58d40eceffdb23a32f282c95dc3 (patch) | |
tree | 5b1aaf7257fffd6cd869137f76b0c21cf6d8419b | |
parent | b8c8305104a3d938a332cc581934af3263f45014 (diff) |
[cxx] Jenkins support for Windows C++. (#10515)
-rwxr-xr-x | scripts/ci/run-jenkins.sh | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/scripts/ci/run-jenkins.sh b/scripts/ci/run-jenkins.sh index 759f30c0559..b7f5c899c47 100755 --- a/scripts/ci/run-jenkins.sh +++ b/scripts/ci/run-jenkins.sh @@ -83,6 +83,7 @@ fi if [[ ${CI_TAGS} == *'cxx'* ]]; then EXTRA_CONF_FLAGS="$EXTRA_CONF_FLAGS -enable-cxx" + MSBUILD_CXX="/p:MONO_COMPILE_AS_CPP=true" fi if [[ ${CI_TAGS} == *'cplusplus'* ]]; then @@ -178,11 +179,11 @@ fi if [[ ${CI_TAGS} == *'win-i386'* ]]; then # only build boehm on w32 (only windows platform supporting boehm). - ${TESTCMD} --label=make-msvc --timeout=60m --fatal /cygdrive/c/Program\ Files\ \(x86\)/MSBuild/14.0/Bin/MSBuild.exe /p:PlatformToolset=v140 /p:Platform=${PLATFORM} /p:Configuration=Release /p:MONO_TARGET_GC=boehm msvc/mono.sln + ${TESTCMD} --label=make-msvc --timeout=60m --fatal /cygdrive/c/Program\ Files\ \(x86\)/MSBuild/14.0/Bin/MSBuild.exe /p:PlatformToolset=v140 /p:Platform=${PLATFORM} /p:Configuration=Release ${MSBUILD_CXX} /p:MONO_TARGET_GC=boehm msvc/mono.sln fi if [[ ${CI_TAGS} == *'win-'* ]]; then - ${TESTCMD} --label=make-msvc-sgen --timeout=60m --fatal /cygdrive/c/Program\ Files\ \(x86\)/MSBuild/14.0/Bin/MSBuild.exe /p:PlatformToolset=v140 /p:Platform=${PLATFORM} /p:Configuration=Release /p:MONO_TARGET_GC=sgen msvc/mono.sln + ${TESTCMD} --label=make-msvc-sgen --timeout=60m --fatal /cygdrive/c/Program\ Files\ \(x86\)/MSBuild/14.0/Bin/MSBuild.exe /p:PlatformToolset=v140 /p:Platform=${PLATFORM} /p:Configuration=Release ${MSBUILD_CXX} /p:MONO_TARGET_GC=sgen msvc/mono.sln fi if [[ ${CI_TAGS} == *'winaot'* ]]; |