this release will have arm64 and x86_64 support. in the future it might be useful to move to mac/iphone targets to help disambiguate arm64-darwin-gcc and arm64-darwin20-gcc.
Unified · Split
| @@ -62,6 +62,7 @@ COMPILING THE APPLICATIONS/LIBRARIES: · 61 unmodified lines | ||
| 62 | 62 | |
| 63 | 63 | arm64-android-gcc |
| 64 | 64 | arm64-darwin-gcc |
| 65 | + arm64-darwin20-gcc | |
| 65 | 66 | arm64-linux-gcc |
| 66 | 67 | arm64-win64-gcc |
| 67 | 68 | arm64-win64-vs15 |
| @@ -113,6 +114,7 @@ COMPILING THE APPLICATIONS/LIBRARIES: · 45 unmodified lines | ||
| 113 | 114 | x86_64-darwin17-gcc |
| 114 | 115 | x86_64-darwin18-gcc |
| 115 | 116 | x86_64-darwin19-gcc |
| 117 | + x86_64-darwin20-gcc | |
| 116 | 118 | x86_64-iphonesimulator-gcc |
| 117 | 119 | x86_64-linux-gcc |
| 118 | 120 | x86_64-linux-icc |
| @@ -774,6 +774,10 @@ process_common_toolchain() { · 773 unmodified lines | ||
| 774 | 774 | tgt_isa=x86_64 |
| 775 | 775 | tgt_os=`echo $gcctarget | sed 's/.*\(darwin1[0-9]\).*/\1/'` |
| 776 | 776 | ;; |
| 777 | + *darwin20*) | |
| 778 | + tgt_isa=`uname -m` | |
| 779 | + tgt_os=`echo $gcctarget | sed 's/.*\(darwin2[0-9]\).*/\1/'` | |
| 780 | + ;; | |
| 777 | 781 | x86_64*mingw32*) |
| 778 | 782 | tgt_os=win64 |
| 779 | 783 | ;; |
| @@ -848,7 +852,7 @@ process_common_toolchain() { · 68 unmodified lines | ||
| 848 | 852 | # Handle darwin variants. Newer SDKs allow targeting older |
| 849 | 853 | # platforms, so use the newest one available. |
| 850 | 854 | case ${toolchain} in |
| 851 | − arm*-darwin*) | |
| 855 | + arm*-darwin-) | |
| 852 | 856 | add_cflags "-miphoneos-version-min=${IOS_VERSION_MIN}" |
| 853 | 857 | iphoneos_sdk_dir="$(show_darwin_sdk_path iphoneos)" |
| 854 | 858 | if [ -d "${iphoneos_sdk_dir}" ]; then |
| @@ -856,7 +860,7 @@ process_common_toolchain() { · 1 unmodified line | ||
| 856 | 860 | add_ldflags "-isysroot ${iphoneos_sdk_dir}" |
| 857 | 861 | fi |
| 858 | 862 | ;; |
| 859 | − x86*-darwin*) | |
| 863 | + *-darwin*) | |
| 860 | 864 | osx_sdk_dir="$(show_darwin_sdk_path macosx)" |
| 861 | 865 | if [ -d "${osx_sdk_dir}" ]; then |
| 862 | 866 | add_cflags "-isysroot ${osx_sdk_dir}" |
| @@ -914,6 +918,10 @@ process_common_toolchain() { · 51 unmodified lines | ||
| 914 | 918 | add_cflags "-mmacosx-version-min=10.15" |
| 915 | 919 | add_ldflags "-mmacosx-version-min=10.15" |
| 916 | 920 | ;; |
| 921 | + *-darwin20-*) | |
| 922 | + add_cflags "-mmacosx-version-min=10.16" | |
| 923 | + add_ldflags "-mmacosx-version-min=10.16" | |
| 924 | + ;; | |
| 917 | 925 | *-iphonesimulator-*) |
| 918 | 926 | add_cflags "-miphoneos-version-min=${IOS_VERSION_MIN}" |
| 919 | 927 | add_ldflags "-miphoneos-version-min=${IOS_VERSION_MIN}" |
| @@ -1087,7 +1095,7 @@ EOF · 167 unmodified lines | ||
| 1087 | 1095 | soft_enable unit_tests |
| 1088 | 1096 | ;; |
| 1089 | 1097 | |
| 1090 | − darwin*) | |
| 1098 | + darwin) | |
| 1091 | 1099 | if ! enabled external_build; then |
| 1092 | 1100 | XCRUN_FIND="xcrun --sdk iphoneos --find" |
| 1093 | 1101 | CXX="$(${XCRUN_FIND} clang++)" |
| @@ -99,6 +99,7 @@ EOF · 98 unmodified lines | ||
| 99 | 99 | # alphabetically by architecture, generic-gnu last. |
| 100 | 100 | all_platforms="${all_platforms} arm64-android-gcc" |
| 101 | 101 | all_platforms="${all_platforms} arm64-darwin-gcc" |
| 102 | +all_platforms="${all_platforms} arm64-darwin20-gcc" | |
| 102 | 103 | all_platforms="${all_platforms} arm64-linux-gcc" |
| 103 | 104 | all_platforms="${all_platforms} arm64-win64-gcc" |
| 104 | 105 | all_platforms="${all_platforms} arm64-win64-vs15" |
| @@ -150,6 +151,7 @@ all_platforms="${all_platforms} x86_64-darwin16-gcc" · 45 unmodified lines | ||
| 150 | 151 | all_platforms="${all_platforms} x86_64-darwin17-gcc" |
| 151 | 152 | all_platforms="${all_platforms} x86_64-darwin18-gcc" |
| 152 | 153 | all_platforms="${all_platforms} x86_64-darwin19-gcc" |
| 154 | +all_platforms="${all_platforms} x86_64-darwin20-gcc" | |
| 153 | 155 | all_platforms="${all_platforms} x86_64-iphonesimulator-gcc" |
| 154 | 156 | all_platforms="${all_platforms} x86_64-linux-gcc" |
| 155 | 157 | all_platforms="${all_platforms} x86_64-linux-icc" |