diff options
| author |  MerryMage | 2018-01-27 15:36:38 +0000 |
|---|---|---|
| committer | MerryMage | 2018-01-27 15:36:38 +0000 |
| commit | 6755c0d1cfb61e752cee7c2eb062fd09b63246f0 (patch) | |
| tree | 460f25767bed58f10765c88b0ff0b9a751a5b0de | |
| parent | Merge pull request #72 from N00byKing/patch-2 (diff) | |
| download | yuzu-6755c0d1cfb61e752cee7c2eb062fd09b63246f0.tar.gz yuzu-6755c0d1cfb61e752cee7c2eb062fd09b63246f0.tar.xz yuzu-6755c0d1cfb61e752cee7c2eb062fd09b63246f0.zip | |
travis: Remove CMAKE_OSX_ARCHITECTURES argument
Unicorn only builds a x86_64 library, without a x86_64h slice. We can't link against
x86_64-only in this manner for static libraries.
| -rwxr-xr-x | .travis/macos/build.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.travis/macos/build.sh b/.travis/macos/build.sh index 177e8ac3b..1d0d120ac 100755 --- a/.travis/macos/build.sh +++ b/.travis/macos/build.sh | |||
| @@ -8,7 +8,7 @@ export UNICORNDIR=$(pwd)/externals/unicorn | |||
| 8 | 8 | ||
| 9 | mkdir build && cd build | 9 | mkdir build && cd build |
| 10 | cmake --version | 10 | cmake --version |
| 11 | cmake .. -DYUZU_BUILD_UNICORN=ON -DCMAKE_OSX_ARCHITECTURES="x86_64;x86_64h" -DCMAKE_BUILD_TYPE=Release | 11 | cmake .. -DYUZU_BUILD_UNICORN=ON -DCMAKE_BUILD_TYPE=Release |
| 12 | make -j4 | 12 | make -j4 |
| 13 | 13 | ||
| 14 | ctest -VV -C Release | 14 | ctest -VV -C Release |