diff --git a/contrib/devtools/build_cmake.sh b/contrib/devtools/build_cmake.sh --- a/contrib/devtools/build_cmake.sh +++ b/contrib/devtools/build_cmake.sh @@ -75,6 +75,10 @@ esac done +# If cross building for OSX, the python library needs to be added to the python +# library path. +export PYTHONPATH="${TOPLEVEL}/depends/x86_64-apple-darwin16/native/lib/python3/dist-packages:${PYTHONPATH:-}" + cmake -GNinja "${TOPLEVEL}" "${CMAKE_FLAGS[@]}" # If valid targets are given, use them, otherwise default to "all". diff --git a/contrib/teamcity/build-configurations.yml b/contrib/teamcity/build-configurations.yml --- a/contrib/teamcity/build-configurations.yml +++ b/contrib/teamcity/build-configurations.yml @@ -230,12 +230,17 @@ timeout: 4800 build-osx: - script: builds/build-osx.sh - templates: - - common_unix_artifacts + cross_build: + static_depends: osx + toolchain: OSX + targets: + - - all + - install + - install-secp256k1 + - install-tests + - - osx-dmg timeout: 3600 artifacts: - src/qt/BitcoinABC-Qt.app: bin Bitcoin-ABC.dmg: Bitcoin-ABC.dmg build-secp256k1: diff --git a/contrib/teamcity/builds/build-osx.sh b/contrib/teamcity/builds/build-osx.sh deleted file mode 100755 --- a/contrib/teamcity/builds/build-osx.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/usr/bin/env bash - -export LC_ALL=C.UTF-8 - -set -euxo pipefail - -# shellcheck source=../ci-fixture.sh -source "${TOPLEVEL}/contrib/teamcity/ci-fixture.sh" - -export PYTHONPATH="${TOPLEVEL}/depends/x86_64-apple-darwin16/native/lib/python3/dist-packages:${PYTHONPATH:-}" - -build_static_dependencies osx - -CMAKE_FLAGS=( - "-DCMAKE_TOOLCHAIN_FILE=${CMAKE_PLATFORMS_DIR}/OSX.cmake" -) -build_with_cmake - -# Build all the targets that are not built as part of the default target -ninja test_bitcoin test_bitcoin-qt test-seeder - -ninja osx-dmg