diff --git a/ci/travis_linux_script b/ci/travis_linux_script index 7e37d44ce6..d841127fbf 100755 --- a/ci/travis_linux_script +++ b/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 diff --git a/src/link.cpp b/src/link.cpp index 7d5ae7dd94..6134a8f568 100644 --- a/src/link.cpp +++ b/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 { diff --git a/test/tests.zig b/test/tests.zig index fafbd436d6..88577f9bb0 100644 --- a/test/tests.zig +++ b/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, },