| author |  Andrew Kelley <andrew@ziglang.org> 2017-08-30 15:15:14-04:00 |
| committer | Andrew Kelley <andrew@ziglang.org> 2017-08-30 15:15:14-04:00 |
| log | 97013951dd13e8b6f397abe2f41ca8ba678fb66e |
| tree | 85532c4c353cc015194651276c8247350c96f53d |
| parent | 0e9bdb44a6ca022558ed703749353c76e796dc35 |
tests use darwin, not macosx since that's what macbook reports as
3 files changed, 3 insertions(+), 3 deletions(-)
ci/travis_linux_script+1-1
| ... | @@ -9,7 +9,7 @@ which $CXX | ... | @@ -9,7 +9,7 @@ which $CXX |
| 9 | echo $PATH | 9 | echo $PATH |
| 10 | mkdir build | 10 | mkdir build |
| 11 | cd build | 11 | cd build |
| 12 | 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 | 12 | 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)) |
| 13 | make VERBOSE=1 | 13 | make VERBOSE=1 |
| 14 | make install | 14 | make install |
| 15 | ./zig build --build-file ../build.zig test | 15 | ./zig build --build-file ../build.zig test |
src/link.cpp+1-1
| ... | @@ -573,7 +573,7 @@ static void get_darwin_platform(LinkJob *lj, DarwinPlatform *platform) { | ... | @@ -573,7 +573,7 @@ static void get_darwin_platform(LinkJob *lj, DarwinPlatform *platform) { |
| 573 | platform->kind = MacOS; | 573 | platform->kind = MacOS; |
| 574 | } else if (g->mios_version_min) { | 574 | } else if (g->mios_version_min) { |
| 575 | platform->kind = IPhoneOS; | 575 | platform->kind = IPhoneOS; |
| 576 | } else if (g->zig_target.os == ZigLLVM_MacOSX) { | 576 | } else if (g->zig_target.os == ZigLLVM_MacOSX || g->zig_target.os == ZigLLVM_Darwin) { |
| 577 | platform->kind = MacOS; | 577 | platform->kind = MacOS; |
| 578 | g->mmacosx_version_min = buf_create_from_str("10.10"); | 578 | g->mmacosx_version_min = buf_create_from_str("10.10"); |
| 579 | } else { | 579 | } else { |
test/tests.zig+1-1
| ... | @@ -32,7 +32,7 @@ const test_targets = []TestTarget { | ... | @@ -32,7 +32,7 @@ const test_targets = []TestTarget { |
| 32 | .environ = builtin.Environ.gnu, | 32 | .environ = builtin.Environ.gnu, |
| 33 | }, | 33 | }, |
| 34 | TestTarget { | 34 | TestTarget { |
| 35 | .os = builtin.Os.macosx, | 35 | .os = builtin.Os.darwin, |
| 36 | .arch = builtin.Arch.x86_64, | 36 | .arch = builtin.Arch.x86_64, |
| 37 | .environ = builtin.Environ.unknown, | 37 | .environ = builtin.Environ.unknown, |
| 38 | }, | 38 | }, |