tpoechtrager/osxcross
1
1
Fork 0
mirror of https://github.com/tpoechtrager/osxcross.git synced 2024-10-03 21:28:33 +03:00
Code Issues Projects Releases Wiki Activity

Compare commits

base: tpoechtrager:2f60d1e90d21ed17c0889a5aaf2efaccd5d9e8bc
Branches Tags
tpoechtrager:master
tpoechtrager:testing
tpoechtrager:ppc-test
tpoechtrager:osxcross-1.1
tpoechtrager:cygwin
...
compare: tpoechtrager:ae67f655dcce2736d864eddd5f9345619fb014ca
Branches Tags
tpoechtrager:master
tpoechtrager:testing
tpoechtrager:ppc-test
tpoechtrager:osxcross-1.1
tpoechtrager:cygwin

4 Commits
2f60d1e90d ... ae67f655dc

Author SHA1 Message Date
Thomas Pöchtrager
ae67f655dc Update osxcross-macports 2024-08-15 17:25:59 +02:00
Thomas Pöchtrager
a11bcae74a
Merge pull request #409 from efa/master 
tools/osxcross-macports: add support for "any" darwin version
 2024-08-15 17:14:34 +02:00
Thomas Pöchtrager
3d84763077 Update build_compiler_rt.sh 2024-08-15 17:12:38 +02:00
Valerio Messina
44c4c77304 tools/osxcross-macports: add support for "any" darwin version 
like packages: https://packages.macports.org/xorg-xorgproto/
 2023-12-12 00:50:19 +01:00
2 changed files with 15 additions and 3 deletions
Show Stats Expand all files Collapse all files

13
build_compiler_rt.sh
View File

@ -56,9 +56,10 @@ case $CLANG_VERSION in
14.* ) BRANCH=release/14.x; USE_CMAKE=1; ;;
15.* ) BRANCH=release/15.x; USE_CMAKE=1; ;;
16.* ) BRANCH=release/16.x; USE_CMAKE=1; ;;
17.* ) BRANCH=main; USE_CMAKE=1; ;;
18.* ) BRANCH=main; USE_CMAKE=1; ;;
* ) echo "Unsupported Clang version, must be >= 3.2 and <= 18.0" 1>&2; exit 1;
17.* ) BRANCH=release/17.x; USE_CMAKE=1; ;;
18.* ) BRANCH=main; USE_CMAKE=1; ;; # Does not build with release/18.x
19.* ) BRANCH=main; USE_CMAKE=1; ;;
* ) echo "Unsupported Clang version, must be >= 3.2 and <= 19.0" 1>&2; exit 1;
esac
if [ $(osxcross-cmp $CLANG_VERSION ">=" 3.5) -eq 1 ]; then
@ -133,6 +134,12 @@ if [ $f_res -eq 1 ]; then
$SED -i "s/COMMAND ld /COMMAND xcrun ld /g" \
cmake/Modules/CompilerRTDarwinUtils.cmake
$SED -i "s/COMMAND sysctl hw.cputype/COMMAND true/g" \
cmake/Modules/CompilerRTDarwinUtils.cmake
$SED -i "s/COMMAND sysctl hw.cpusubtype/COMMAND true/g" \
cmake/Modules/CompilerRTDarwinUtils.cmake
$SED -i "s/COMMAND codesign /COMMAND true /g" \
cmake/Modules/AddCompilerRT.cmake

5
tools/osxcross-macports
View File

@ -84,6 +84,8 @@ case $MACOSX_DEPLOYMENT_TARGET in
11.* ) OSXVERSION="darwin_20" ;;
12.* ) OSXVERSION="darwin_21" ;;
13.* ) OSXVERSION="darwin_22" ;;
14.* ) OSXVERSION="darwin_23" ;;
15.* ) OSXVERSION="darwin_24" ;;
* ) unsupportedDepTarget ;;
esac
@ -321,6 +323,9 @@ getPkgUrl()
if [ -z "$pkg" ]; then
pkg=$(echo "$pkgs" | grep $OSXVERSION | grep "noarch" | uniq | tail -n1)
fi
if [ -z "$pkg" ]; then
pkg=$(echo "$pkgs" | grep "any" | grep "noarch" | uniq | tail -n1)
fi
verboseMsg " selected: $pkg"