Commit 97013951dd

Andrew Kelley <superjoe30@gmail.com>
2017-08-30 21:15:14
tests use darwin, not macosx since that's what macbook reports as
master
1 parent 0e9bdb4
Changed files (3)
ci
travis_linux_script
src
link.cpp
test
tests.zig
ci/travis_linux_script
@@ -9,7 +9,7 @@ which $CXX
 echo $PATH
 mkdir build
 cd build
-cmake .. -DCMAKE_INSTALL_PREFIX=$(pwd) -DZIG_LIBC_LIB_DIR=$(dirname $($CC -print-file-name=crt1.o)) -DZIG_LIBC_INCLUDE_DIR=$(echo -n | $CC -E -x c - -v 2>&1 | grep -B1 "End of search list." | head -n1 | cut -c 2- | sed "s/ .*//") -DZIG_LIBC_STATIC_LIB_DIR=$(dirname $($CC -print-file-name=crtbegin.o)) -DZIG_FORCE_EXTERNAL_LLD=ON
+cmake .. -DCMAKE_INSTALL_PREFIX=$(pwd) -DZIG_LIBC_LIB_DIR=$(dirname $($CC -print-file-name=crt1.o)) -DZIG_LIBC_INCLUDE_DIR=$(echo -n | $CC -E -x c - -v 2>&1 | grep -B1 "End of search list." | head -n1 | cut -c 2- | sed "s/ .*//") -DZIG_LIBC_STATIC_LIB_DIR=$(dirname $($CC -print-file-name=crtbegin.o))
 make VERBOSE=1
 make install
 ./zig build --build-file ../build.zig test
src/link.cpp
@@ -573,7 +573,7 @@ static void get_darwin_platform(LinkJob *lj, DarwinPlatform *platform) {
         platform->kind = MacOS;
     } else if (g->mios_version_min) {
         platform->kind = IPhoneOS;
-    } else if (g->zig_target.os == ZigLLVM_MacOSX) {
+    } else if (g->zig_target.os == ZigLLVM_MacOSX || g->zig_target.os == ZigLLVM_Darwin) {
         platform->kind = MacOS;
         g->mmacosx_version_min = buf_create_from_str("10.10");
     } else {
test/tests.zig
@@ -32,7 +32,7 @@ const test_targets = []TestTarget {
         .environ = builtin.Environ.gnu,
     },
     TestTarget {
-        .os = builtin.Os.macosx,
+        .os = builtin.Os.darwin,
         .arch = builtin.Arch.x86_64,
         .environ = builtin.Environ.unknown,
     },