Relintai/osxcross
1
0
Fork 0
mirror of https://github.com/Relintai/osxcross.git synced 2025-02-08 02:55:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

More work on ARM target

Browse Source
This commit is contained in:
Thomas Pöchtrager 2020-08-16 19:26:58 +02:00
parent 261de10511
commit 5489149683
3 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
build.sh
View File

@ -257,10 +257,25 @@ fi
cp -f "$BASE_DIR/tools/toolchain.cmake" "$TARGET_DIR/" cp -f "$BASE_DIR/tools/toolchain.cmake" "$TARGET_DIR/"
cp -f "$BASE_DIR/tools/osxcross-cmake" "$TARGET_DIR/bin/" cp -f "$BASE_DIR/tools/osxcross-cmake" "$TARGET_DIR/bin/"
chmod 755 "$TARGET_DIR/bin/osxcross-cmake" chmod 755 "$TARGET_DIR/bin/osxcross-cmake"
create_symlink osxcross-cmake "$TARGET_DIR/bin/i386-apple-$TARGET-cmake"
if [ $I386_SUPPORTED -eq 1 ]; then
create_symlink osxcross-cmake "$TARGET_DIR/bin/i386-apple-$TARGET-cmake"
fi
create_symlink osxcross-cmake "$TARGET_DIR/bin/x86_64-apple-$TARGET-cmake" create_symlink osxcross-cmake "$TARGET_DIR/bin/x86_64-apple-$TARGET-cmake"
if [ $X86_64H_SUPPORTED -eq 1 ]; then
create_symlink osxcross-cmake "$TARGET_DIR/bin/x86_64h-apple-$TARGET-cmake"
fi
if [ $ARM_SUPPORTED -eq 1 ]; then
create_symlink osxcross-cmake "$TARGET_DIR/bin/arm64-apple-$TARGET-cmake"
create_symlink osxcross-cmake "$TARGET_DIR/bin/arm64e-apple-$TARGET-cmake"
fi
## Compiler test ## ## Compiler test ##
unset MACOSX_DEPLOYMENT_TARGET unset MACOSX_DEPLOYMENT_TARGET

11
tools/toolchain.cmake
View File

@ -21,15 +21,8 @@ set(CMAKE_SYSTEM_NAME "Darwin")
string(REGEX REPLACE "-.*" "" CMAKE_SYSTEM_PROCESSOR "${OSXCROSS_HOST}") string(REGEX REPLACE "-.*" "" CMAKE_SYSTEM_PROCESSOR "${OSXCROSS_HOST}")
# specify the cross compiler # specify the cross compiler
if(CMAKE_SYSTEM_PROCESSOR MATCHES "^i.86$") set(CMAKE_C_COMPILER "${OSXCROSS_TARGET_DIR}/bin/${OSXCROSS_HOST}-clang")
set(CMAKE_C_COMPILER "${OSXCROSS_TARGET_DIR}/bin/o32-clang") set(CMAKE_CXX_COMPILER "${OSXCROSS_TARGET_DIR}/bin/${OSXCROSS_HOST}-clang++")
set(CMAKE_CXX_COMPILER "${OSXCROSS_TARGET_DIR}/bin/o32-clang++")
elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
set(CMAKE_C_COMPILER "${OSXCROSS_TARGET_DIR}/bin/o64-clang")
set(CMAKE_CXX_COMPILER "${OSXCROSS_TARGET_DIR}/bin/o64-clang++")
else()
message(FATAL_ERROR "Unrecognized target architecture")
endif()
# where is the target environment # where is the target environment
set(CMAKE_FIND_ROOT_PATH set(CMAKE_FIND_ROOT_PATH

5
wrapper/target.cpp
View File

@ -809,8 +809,9 @@ bool Target::setup() {
if (OSNum.Num()) { if (OSNum.Num()) {
std::string tmp; std::string tmp;
tmp = "-mmacosx-version-min="; tmp = "-mmacosx-version-min=";
if (OSNum >= OSVersion(11, 0)) { if (clangversion <= ClangVersion(11, 0) &&
// Fix this once clang is able to parse 11.x OSNum >= OSVersion(11, 0)) {
// Clang <= 11.0 can't parse -mmacosx-version-min=11.x
tmp += "10.16"; tmp += "10.16";
} else { } else {
tmp += OSNum.Str(); tmp += OSNum.Str();