diff options
| author | Riccardo Spagni <ric@spagni.net> | 2018-10-26 22:40:10 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2018-10-26 22:40:10 +0200 |
| commit | 6a54830107e0e94e4fb4d76548ecc1459370e383 (patch) | |
| tree | 7e00e1ea1f401c9b478658b80d9b481d1f7accb6 | |
| parent | Merge pull request #4620 (diff) | |
| parent | Remove Travis check in depends toolchain file (diff) | |
| download | monero-6a54830107e0e94e4fb4d76548ecc1459370e383.tar.xz | |
Merge pull request #4646
109717a5 Remove Travis check in depends toolchain file (TheCharlatan)
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rw-r--r-- | contrib/depends/toolchain.cmake.in | 3 |
2 files changed, 1 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml index 6a9b9b94b..ca3a24ae8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -58,7 +58,7 @@ script: - export TRAVIS_COMMIT_LOG=`git log --format=fuller -1` - OUTDIR=$BASE_OUTDIR/$TRAVIS_PULL_REQUEST/$TRAVIS_JOB_NUMBER-$HOST - if [ -z "$NO_DEPENDS" ]; then $DOCKER_EXEC ccache --max-size=$CCACHE_SIZE; fi - - $DOCKER_EXEC bash -c "mkdir build && cd build && cmake -DCMAKE_TOOLCHAIN_FILE=$TRAVIS_BUILD_DIR/contrib/depends/$HOST/share/toolchain.cmake -DTRAVIS=true .. && make $MAKEJOBS" + - $DOCKER_EXEC bash -c "mkdir build && cd build && cmake -DCMAKE_TOOLCHAIN_FILE=$TRAVIS_BUILD_DIR/contrib/depends/$HOST/share/toolchain.cmake .. && make $MAKEJOBS" - export LD_LIBRARY_PATH=$TRAVIS_BUILD_DIR/contrib/depends/$HOST/lib after_script: - echo $TRAVIS_COMMIT_RANGE diff --git a/contrib/depends/toolchain.cmake.in b/contrib/depends/toolchain.cmake.in index 66168facb..f59b7b5ee 100644 --- a/contrib/depends/toolchain.cmake.in +++ b/contrib/depends/toolchain.cmake.in @@ -51,9 +51,6 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Darwin") SET(APPLE True) SET(BUILD_TAG "mac-x64") SET(BUILD_64 ON) - if(NOT TRAVIS) - SET(ARCH "x86_64") - endif() SET(BREW OFF) SET(PORT OFF) SET(CMAKE_OSX_SYSROOT "@sdk@/MacOSX10.11.sdk/") |