| author |  Andrew Kelley <andrew@ziglang.org> 2018-01-04 23:30:03-05:00 |
| committer | Andrew Kelley <andrew@ziglang.org> 2018-01-04 23:30:03-05:00 |
| log | 7f0b12a481110c5f8c5bafa42bf21306f3798366 |
| tree | e5f7a063934b19f80685f6546a7ffd445713e4a9 |
| parent | 25ad0b47e2e9478f50ca06b14f9a6558f571ee3b |
appveyor: skip building self hosted compiler for now
3 files changed, 6 insertions(+), 3 deletions(-)
- build.zig
ci- appveyor
build.zig+5-1
| ... | ... | @@ -85,7 +85,11 @@ pub fn build(b: &Builder) { |
| 85 | 85 | |
| 86 | 86 | b.default_step.dependOn(&exe.step); |
| 87 | 87 | b.default_step.dependOn(docs_step); |
| 88 | test_step.dependOn(&exe.step); | |
| 88 | ||
| 89 | const skip_self_hosted = b.option(bool, "skip-self-hosted", "Main test suite skips building self hosted compiler") ?? false; | |
| 90 | if (!skip_self_hosted) { | |
| 91 | test_step.dependOn(&exe.step); | |
| 92 | } | |
| 89 | 93 | |
| 90 | 94 | b.installArtifact(exe); |
| 91 | 95 | installStdLib(b, std_files); |
ci/appveyor/appveyor.yml-1
| ... | ... | @@ -6,5 +6,4 @@ build_script: |
| 6 | 6 | after_build: |
| 7 | 7 | - '%APPVEYOR_BUILD_FOLDER%\ci\appveyor\after_build.bat' |
| 8 | 8 | cache: |
| 9 | - 'llvm+clang-5.0.0-win64-msvc-release.tar.xz' | |
| 10 | 9 | - 'llvm+clang-5.0.1-win64-msvc-release.tar.xz' |
ci/appveyor/build_script.bat+1-1
| ... | ... | @@ -23,7 +23,7 @@ cd %ZIGBUILDDIR% |
| 23 | 23 | cmake.exe .. -Thost=x64 -G"Visual Studio 14 2015 Win64" "-DCMAKE_INSTALL_PREFIX=%ZIGBUILDDIR%" "-DCMAKE_PREFIX_PATH=%ZIGPREFIXPATH%" -DCMAKE_BUILD_TYPE=Release "-DZIG_LIBC_INCLUDE_DIR=C:\Program Files (x86)\Windows Kits\10\Include\10.0.26624.0\ucrt" "-DZIG_LIBC_LIB_DIR=C:\Program Files (x86)\Windows Kits\10\bin\x64\ucrt" "-DZIG_LIBC_STATIC_LIB_DIR=C:\Program Files (x86)\Windows Kits\10\Lib\10.0.26624.0\ucrt\x64" || exit /b |
| 24 | 24 | msbuild /p:Configuration=Release INSTALL.vcxproj || exit /b |
| 25 | 25 | |
| 26 | bin\zig.exe build --build-file ..\build.zig test || exit /b | |
| 26 | bin\zig.exe build --build-file ..\build.zig test -Dskip-self-hosted || exit /b | |
| 27 | 27 | |
| 28 | 28 | @echo "MSVC build succeeded, proceeding with MinGW build" |
| 29 | 29 | cd %APPVEYOR_BUILD_FOLDER% |