From 84b6e89300f63ea416bbc9e6b7b1a77978c34a3f Mon Sep 17 00:00:00 2001 From: Rodrigo Kumpera Date: Thu, 4 Oct 2018 17:18:28 -0400 Subject: [aot] Add clangxx option to --aot (#10779) * [aot] Add clangxx option to --aot that removes the hardcoded clang++ in our aot compiler. * [mini] Make --aot addictive. * Update CI script for bitcode. --- scripts/ci/run-jenkins.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'scripts') diff --git a/scripts/ci/run-jenkins.sh b/scripts/ci/run-jenkins.sh index 05ad66e0ad0..d954f253b9b 100755 --- a/scripts/ci/run-jenkins.sh +++ b/scripts/ci/run-jenkins.sh @@ -64,7 +64,7 @@ elif [[ ${CI_TAGS} == *'fullaot'* ]]; then EXTRA_CONF_FLAGS="${EXTRA_ elif [[ ${CI_TAGS} == *'hybridaot'* ]]; then EXTRA_CONF_FLAGS="${EXTRA_CONF_FLAGS} --with-runtime-preset=hybridaot"; elif [[ ${CI_TAGS} == *'winaot'* ]]; then EXTRA_CONF_FLAGS="${EXTRA_CONF_FLAGS} --with-runtime-preset=winaot"; elif [[ ${CI_TAGS} == *'aot'* ]]; then EXTRA_CONF_FLAGS="${EXTRA_CONF_FLAGS} --with-runtime-preset=aot"; -elif [[ ${CI_TAGS} == *'bitcode'* ]]; then EXTRA_CONF_FLAGS="${EXTRA_CONF_FLAGS} --with-runtime-preset=bitcode"; +elif [[ ${CI_TAGS} == *'bitcode'* ]]; then EXTRA_CONF_FLAGS="${EXTRA_CONF_FLAGS} --with-runtime-preset=bitcode"; export MONO_ENV_OPTIONS="$MONO_ENV_OPTIONS --aot=clangxx=clang++-6.0"; elif [[ ${CI_TAGS} == *'acceptance-tests'* ]]; then EXTRA_CONF_FLAGS="${EXTRA_CONF_FLAGS} --prefix=${MONO_REPO_ROOT}/tmp/mono-acceptance-tests --with-sgen-default-concurrent=yes"; elif [[ ${CI_TAGS} == *'all-profiles'* ]]; then # only enable build of the additional profiles on one config to save time -- cgit v1.2.3