Merge remote-tracking branch 'origin/master' into llvm10

ziglang · Mar 22, 2020 · 23c2637 · 23c2637
2 parents 53b5aa8 + a8fa1ec
commit 23c2637
Show file tree

Hide file tree

Showing 29 changed files with 459 additions and 93 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -430,7 +430,6 @@ set(BUILD_LIBSTAGE2_ARGS "build-lib"
     --cache on
     --output-dir "${CMAKE_BINARY_DIR}"
     ${LIBSTAGE2_RELEASE_ARG}
-    --disable-gen-h
     --bundle-compiler-rt
     -fPIC
     -lc

diff --git a/build.zig b/build.zig
@@ -135,7 +135,8 @@ pub fn build(b: *Builder) !void {
     test_step.dependOn(tests.addRuntimeSafetyTests(b, test_filter, modes));
     test_step.dependOn(tests.addTranslateCTests(b, test_filter));
     test_step.dependOn(tests.addRunTranslatedCTests(b, test_filter));
-    test_step.dependOn(tests.addGenHTests(b, test_filter));
+    // tests for this feature are disabled until we have the self-hosted compiler available
+    //test_step.dependOn(tests.addGenHTests(b, test_filter));
     test_step.dependOn(tests.addCompileErrorTests(b, test_filter, modes));
     test_step.dependOn(docs_step);
 }

diff --git a/ci/drone/linux_script b/ci/drone/linux_script
@@ -26,7 +26,8 @@ make -j$(nproc) install
 # TODO test-cli is hitting https://github.com/ziglang/zig/issues/3526
 ./zig build test-asm-link test-runtime-safety
 # TODO test-translate-c is hitting https://github.com/ziglang/zig/issues/3526
-./zig build test-gen-h
+# TODO disabled until we are shipping self-hosted
+#./zig build test-gen-h
 # TODO test-compile-errors is hitting https://github.com/ziglang/zig/issues/3526
 # TODO building docs is hitting https://github.com/ziglang/zig/issues/3526
 

diff --git a/ci/srht/freebsd_script b/ci/srht/freebsd_script
@@ -42,7 +42,8 @@ release/bin/zig build test-asm-link
 release/bin/zig build test-runtime-safety
 release/bin/zig build test-translate-c
 release/bin/zig build test-run-translated-c
-release/bin/zig build test-gen-h
+# TODO disabled until we are shipping self-hosted
+#release/bin/zig build test-gen-h
 release/bin/zig build test-compile-errors
 release/bin/zig build docs