diff options
| -rw-r--r-- | .azure-pipelines/auto.yml | 38 | ||||
| -rw-r--r-- | .azure-pipelines/steps/windows.yml | 2 |
2 files changed, 19 insertions, 21 deletions
diff --git a/.azure-pipelines/auto.yml b/.azure-pipelines/auto.yml index 3ee52050e2c..748a6a9e748 100644 --- a/.azure-pipelines/auto.yml +++ b/.azure-pipelines/auto.yml @@ -197,26 +197,24 @@ jobs: NO_LLVM_ASSERTIONS: 1 NO_DEBUG_ASSERTIONS: 1 - # # temp disabled - # # https://github.com/johnterickson/rust/issues/18 - # i686-apple: - # RUST_CHECK_TARGET: check - # RUST_CONFIGURE_ARGS: --build=i686-apple-darwin --set rust.jemalloc - # RUSTC_RETRY_LINKER_ON_SEGFAULT: 1 - # MACOSX_DEPLOYMENT_TARGET: 10.8 - # MACOSX_STD_DEPLOYMENT_TARGET: 10.7 - # NO_LLVM_ASSERTIONS: 1 - # NO_DEBUG_ASSERTIONS: 1 - - # dist-i686-apple: - # RUST_CHECK_TARGET: dist - # RUST_CONFIGURE_ARGS: --build=i686-apple-darwin --enable-full-tools --enable-profiler --enable-lldb --set rust.jemalloc - # DEPLOY: 1 - # RUSTC_RETRY_LINKER_ON_SEGFAULT: 1 - # MACOSX_DEPLOYMENT_TARGET: 10.7 - # NO_LLVM_ASSERTIONS: 1 - # NO_DEBUG_ASSERTIONS: 1 - # DIST_REQUIRE_ALL_TOOLS: 1 + i686-apple: + RUST_CHECK_TARGET: check + RUST_CONFIGURE_ARGS: --build=i686-apple-darwin --set rust.jemalloc + RUSTC_RETRY_LINKER_ON_SEGFAULT: 1 + MACOSX_DEPLOYMENT_TARGET: 10.8 + MACOSX_STD_DEPLOYMENT_TARGET: 10.7 + NO_LLVM_ASSERTIONS: 1 + NO_DEBUG_ASSERTIONS: 1 + + dist-i686-apple: + RUST_CHECK_TARGET: dist + RUST_CONFIGURE_ARGS: --build=i686-apple-darwin --enable-full-tools --enable-profiler --enable-lldb --set rust.jemalloc + DEPLOY: 1 + RUSTC_RETRY_LINKER_ON_SEGFAULT: 1 + MACOSX_DEPLOYMENT_TARGET: 10.7 + NO_LLVM_ASSERTIONS: 1 + NO_DEBUG_ASSERTIONS: 1 + DIST_REQUIRE_ALL_TOOLS: 1 diff --git a/.azure-pipelines/steps/windows.yml b/.azure-pipelines/steps/windows.yml index cc11e7a0836..5fb1da2083f 100644 --- a/.azure-pipelines/steps/windows.yml +++ b/.azure-pipelines/steps/windows.yml @@ -134,7 +134,7 @@ steps: - template: show-environment-variables.yml - script: | - REM echo force the specific VS version https://github.com/johnterickson/rust/issues/8 + REM echo force the specific VS version IF "%VCVARS_BAT%" NEQ "" ( CALL "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\%VCVARS_BAT%" ) |