NephNET/builder-cross-darwin
NephNET
/
builder-cross-darwin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Activity

revert i386 triplet
Build Container Image / build_arm64 (push) Successful in 32s Details
Build Container Image / build_amd64 (push) Successful in 35s Details
Build Container Image / publish_arm64 (push) Successful in 14s Details
Build Container Image / build_i386 (push) Successful in 50s Details
Build Container Image / publish_amd64 (push) Successful in 16s Details
Build Container Image / build_manifest (push) Successful in 13s Details
Build Container Image / publish_i386 (push) Successful in 31s Details
Build Container Image / publish_manifest (push) Successful in 29s Details

This commit is contained in:
Daniel Wolf 2023-12-05 16:12:23 -05:00
parent 47aaa076c4
commit 834093e408
Signed by: nephatrine
GPG Key ID: 59D70EC2E4AAB4D0
3 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
override/opt/osxcross/share/nxbuild/darwin-i686.cmake
View File

@ -3,7 +3,7 @@
# SPDX-License-Identifier: ISC
set(CMAKE_SYSTEM_NAME "Darwin")
set(CMAKE_SYSTEM_PROCESSOR "i686")
set(CMAKE_SYSTEM_PROCESSOR "i386")
set(CMAKE_OSX_ARCHITECTURES "i386")
set(CMAKE_SIZEOF_VOID_P 4)
@ -21,7 +21,7 @@ else()
message(FATAL_ERROR "BAD OSX SDK VERSION")
endif()
set(triplet "${CMAKE_OSX_ARCHITECTURES}-apple-darwin${CMAKE_SYSTEM_VERSION}")
set(triplet "${CMAKE_SYSTEM_PROCESSOR}-apple-darwin${CMAKE_SYSTEM_VERSION}")
set(CMAKE_OSX_SYSROOT "$ENV{DARWIN_SYSROOT}")
list(APPEND CMAKE_FIND_ROOT_PATH "/opt/local")
@ -39,8 +39,6 @@ find_program(CMAKE_LINKER NAMES "${triplet}-ld")
find_program(CMAKE_NM NAMES "${triplet}-nm")
find_program(CMAKE_INSTALL_NAME_TOOL NAMES "${triplet}-install_name_tool")
set(triplet "${CMAKE_SYSTEM_PROCESSOR}-apple-darwin${CMAKE_SYSTEM_VERSION}")
set(CMAKE_LIBRARY_ARCHITECTURE "${triplet}")
set(CMAKE_C_LIBRARY_ARCHITECTURE "${CMAKE_LIBRARY_ARCHITECTURE}")
set(CMAKE_CXX_LIBRARY_ARCHITECTURE "${CMAKE_LIBRARY_ARCHITECTURE}")

2
override/opt/osxcross/share/nxbuild/darwin-universal.cmake
View File

@ -21,7 +21,7 @@ endif()
unset(lsArchitectures)
if(CMAKE_SYSTEM_VERSION VERSION_LESS 18)
list(APPEND lsArchitectures "i386")
set(CMAKE_SYSTEM_PROCESSOR "i686")
set(CMAKE_SYSTEM_PROCESSOR "i386")
endif()
if(CMAKE_SYSTEM_VERSION VERSION_LESS 20)
list(APPEND lsArchitectures "x86_64")

4
override/opt/osxcross/share/nxbuild/darwin-x86_64.cmake
View File

@ -25,7 +25,7 @@ if(CMAKE_SYSTEM_VERSION VERSION_GREATER_EQUAL 18)
set(CMAKE_OSX_ARCHITECTURES "x86_64h")
endif()
set(triplet "${CMAKE_OSX_ARCHITECTURES}-apple-darwin${CMAKE_SYSTEM_VERSION}")
set(triplet "${CMAKE_SYSTEM_PROCESSOR}-apple-darwin${CMAKE_SYSTEM_VERSION}")
set(CMAKE_OSX_SYSROOT "$ENV{DARWIN_SYSROOT}")
list(APPEND CMAKE_FIND_ROOT_PATH "/opt/local")
@ -43,8 +43,6 @@ find_program(CMAKE_LINKER NAMES "${triplet}-ld")
find_program(CMAKE_NM NAMES "${triplet}-nm")
find_program(CMAKE_INSTALL_NAME_TOOL NAMES "${triplet}-install_name_tool")
set(triplet "${CMAKE_SYSTEM_PROCESSOR}-apple-darwin${CMAKE_SYSTEM_VERSION}")
set(CMAKE_LIBRARY_ARCHITECTURE "${triplet}")
set(CMAKE_C_LIBRARY_ARCHITECTURE "${CMAKE_LIBRARY_ARCHITECTURE}")
set(CMAKE_CXX_LIBRARY_ARCHITECTURE "${CMAKE_LIBRARY_ARCHITECTURE}")