diff options
| -rw-r--r-- | .github/workflows/depends.yml | 4 | ||||
| -rw-r--r-- | README.md | 2 | ||||
| -rw-r--r-- | contrib/depends/Makefile | 2 | ||||
| -rw-r--r-- | contrib/depends/README.md | 2 | ||||
| -rw-r--r-- | contrib/depends/toolchain.cmake.in | 8 | ||||
| -rw-r--r-- | contrib/gitian/gitian-osx.yml | 2 |
6 files changed, 10 insertions, 10 deletions
diff --git a/.github/workflows/depends.yml b/.github/workflows/depends.yml index 27b294503..423bfde05 100644 --- a/.github/workflows/depends.yml +++ b/.github/workflows/depends.yml @@ -50,10 +50,10 @@ jobs: host: "x86_64-unknown-linux-gnu" packages: "gperf cmake python3-zmq libdbus-1-dev libharfbuzz-dev" - name: "Cross-Mac x86_64" - host: "x86_64-apple-darwin11" + host: "x86_64-apple-darwin" packages: "cmake imagemagick libcap-dev librsvg2-bin libz-dev libbz2-dev libtiff-tools python-dev python3-setuptools-git" - name: "Cross-Mac aarch64" - host: "aarch64-apple-darwin11" + host: "aarch64-apple-darwin" packages: "cmake imagemagick libcap-dev librsvg2-bin libz-dev libbz2-dev libtiff-tools python-dev python3-setuptools-git" - name: "x86_64 Freebsd" host: "x86_64-unknown-freebsd" @@ -566,7 +566,7 @@ You can also cross-compile static binaries on Linux for Windows and macOS with t * Requires: `python3 g++-mingw-w64-x86-64 wine1.6 bc` * You also need to run: ```update-alternatives --set x86_64-w64-mingw32-g++ x86_64-w64-mingw32-g++-posix && update-alternatives --set x86_64-w64-mingw32-gcc x86_64-w64-mingw32-gcc-posix``` -* ```make depends target=x86_64-apple-darwin11``` for macOS binaries. +* ```make depends target=x86_64-apple-darwin``` for macOS binaries. * Requires: `cmake imagemagick libcap-dev librsvg2-bin libz-dev libbz2-dev libtiff-tools python-dev` * ```make depends target=i686-linux-gnu``` for 32-bit linux binaries. * Requires: `g++-multilib bc` diff --git a/contrib/depends/Makefile b/contrib/depends/Makefile index 4b60ee054..dfb0f3cb4 100644 --- a/contrib/depends/Makefile +++ b/contrib/depends/Makefile @@ -185,7 +185,7 @@ install: check-packages $(host_prefix)/share/toolchain.cmake download-one: check-sources $(all_sources) download-osx: - @$(MAKE) -s HOST=x86_64-apple-darwin11 download-one + @$(MAKE) -s HOST=x86_64-apple-darwin download-one download-linux: @$(MAKE) -s HOST=x86_64-unknown-linux-gnu download-one download-win: diff --git a/contrib/depends/README.md b/contrib/depends/README.md index 2f1d8424a..d19baaf8a 100644 --- a/contrib/depends/README.md +++ b/contrib/depends/README.md @@ -32,7 +32,7 @@ Common `host-platform-triplets` for cross compilation are: - `i686-w64-mingw32` for Win32 - `x86_64-w64-mingw32` for Win64 -- `x86_64-apple-darwin11` for MacOSX x86_64 +- `x86_64-apple-darwin` for MacOSX x86_64 - `arm-linux-gnueabihf` for Linux ARM 32 bit - `aarch64-linux-gnu` for Linux ARM 64 bit - `riscv64-linux-gnu` for Linux RISCV 64 bit diff --git a/contrib/depends/toolchain.cmake.in b/contrib/depends/toolchain.cmake.in index 570065560..252abaf09 100644 --- a/contrib/depends/toolchain.cmake.in +++ b/contrib/depends/toolchain.cmake.in @@ -68,15 +68,15 @@ set (CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) # Find includes in target # specify the cross compiler to be used. Darwin uses clang provided by the SDK. if(CMAKE_SYSTEM_NAME STREQUAL "Darwin") if(ARCHITECTURE STREQUAL "aarch64") - SET(CLANG_TARGET "arm64-apple-darwin11") - SET(CONF_TRIPLE "aarch64-apple-darwin11") + SET(CLANG_TARGET "arm64-apple-darwin") + SET(CONF_TRIPLE "aarch64-apple-darwin") SET(BUILD_TAG "mac-armv8") SET(CMAKE_OSX_ARCHITECTURES "arm64") set(ARM ON) set(ARM_ID "armv8-a") else() - SET(CLANG_TARGET "x86_64-apple-darwin11") - SET(CONF_TRIPLE "x86_64-apple-darwin11") + SET(CLANG_TARGET "x86_64-apple-darwin") + SET(CONF_TRIPLE "x86_64-apple-darwin") SET(BUILD_TAG "mac-x64") SET(CMAKE_OSX_ARCHITECTURES "x86_64") endif() diff --git a/contrib/gitian/gitian-osx.yml b/contrib/gitian/gitian-osx.yml index 648688bcd..74ad21ea3 100644 --- a/contrib/gitian/gitian-osx.yml +++ b/contrib/gitian/gitian-osx.yml @@ -29,7 +29,7 @@ remotes: files: [] script: | WRAP_DIR=$HOME/wrapped - HOSTS="x86_64-apple-darwin11 aarch64-apple-darwin11" + HOSTS="x86_64-apple-darwin aarch64-apple-darwin" FAKETIME_HOST_PROGS="" FAKETIME_PROGS="ar ranlib date dmg genisoimage python" |