diff options
| author | tobtoht <tob@featherwallet.org> | 2023-09-27 07:37:01 +0200 |
|---|---|---|
| committer | tobtoht <tob@featherwallet.org> | 2023-09-27 07:37:01 +0200 |
| commit | c8e4de13f2937c90eb8698b87e46e53beaf68d56 (patch) | |
| tree | 84be70d362bd454cef1ecdbdc45dac43e9d9fd72 /contrib/depends | |
| parent | Merge pull request #8976 (diff) | |
| download | monero-c8e4de13f2937c90eb8698b87e46e53beaf68d56.tar.xz | |
depends: remove kernel version from darwin triplet
Diffstat (limited to '')
| -rw-r--r-- | contrib/depends/Makefile | 2 | ||||
| -rw-r--r-- | contrib/depends/README.md | 2 | ||||
| -rw-r--r-- | contrib/depends/toolchain.cmake.in | 8 |
3 files changed, 6 insertions, 6 deletions
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() |