Revert "[ci] Move mcs switch for Win32 builds into the run-jenkins.sh script"
authorVlad Brezae <brezaevlad@gmail.com>
Wed, 7 Dec 2016 12:21:49 +0000 (14:21 +0200)
committerVlad Brezae <brezaevlad@gmail.com>
Tue, 13 Dec 2016 20:55:38 +0000 (22:55 +0200)
This reverts commit 2b8d9bdb0850d98ed65f025a4cdcb4ca3f1eaa19.

scripts/ci/run-jenkins.sh

index 16555a6ae28f37c4ff17fd3f00e5fef4eae58b8a..1365704b9fe6dcdbc7ffc120e2f190840d5afb7f 100755 (executable)
@@ -21,7 +21,7 @@ if [[ ${CI_TAGS} == *'mcs-compiler'* ]]; then EXTRA_CONF_FLAGS="${EXTRA_CONF_FLA
 
 if [[ ${label} == 'osx-i386' ]]; then EXTRA_CONF_FLAGS="${EXTRA_CONF_FLAGS} --with-libgdiplus=/Library/Frameworks/Mono.framework/Versions/Current/lib/libgdiplus.dylib --build=i386-apple-darwin11.2.0"; fi
 if [[ ${label} == 'osx-amd64' ]]; then EXTRA_CONF_FLAGS="${EXTRA_CONF_FLAGS} --with-libgdiplus=/Library/Frameworks/Mono.framework/Versions/Current/lib/libgdiplus.dylib "; fi
-if [[ ${label} == 'w32' ]]; then PLATFORM=Win32; EXTRA_CONF_FLAGS="${EXTRA_CONF_FLAGS} --host=i686-w64-mingw32 --with-csc=mcs"; export MONO_EXECUTABLE="${MONO_REPO_ROOT}/msvc/build/sgen/Win32/bin/Release/mono-sgen.exe"; fi
+if [[ ${label} == 'w32' ]]; then PLATFORM=Win32; EXTRA_CONF_FLAGS="${EXTRA_CONF_FLAGS} --host=i686-w64-mingw32"; export MONO_EXECUTABLE="${MONO_REPO_ROOT}/msvc/build/sgen/Win32/bin/Release/mono-sgen.exe"; fi
 if [[ ${label} == 'w64' ]]; then PLATFORM=x64; EXTRA_CONF_FLAGS="${EXTRA_CONF_FLAGS} --host=x86_64-w64-mingw32 --disable-boehm"; export MONO_EXECUTABLE="${MONO_REPO_ROOT}/msvc/build/sgen/x64/bin/Release/mono-sgen.exe"; fi
 
 if [[ ${CI_TAGS} == *'fullaot_llvm'* ]];