History

configure: add darwin20 support

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.

James Zern committed 6 years ago

Commit 979e27c1 parent aea63123 files · +15 −3Browse files

Unified · Split

3 files
  1. README +2 −0
  2. build/make/configure.sh +11 −3
  3. configure +2 −0
README+2−0
@@ -62,6 +62,7 @@ COMPILING THE APPLICATIONS/LIBRARIES: · 61 unmodified lines
62 62
63 arm64-android-gcc63 arm64-android-gcc
64 arm64-darwin-gcc64 arm64-darwin-gcc
65 arm64-darwin20-gcc
65 arm64-linux-gcc66 arm64-linux-gcc
66 arm64-win64-gcc67 arm64-win64-gcc
67 arm64-win64-vs1568 arm64-win64-vs15
@@ -113,6 +114,7 @@ COMPILING THE APPLICATIONS/LIBRARIES: · 45 unmodified lines
113 x86_64-darwin17-gcc114 x86_64-darwin17-gcc
114 x86_64-darwin18-gcc115 x86_64-darwin18-gcc
115 x86_64-darwin19-gcc116 x86_64-darwin19-gcc
117 x86_64-darwin20-gcc
116 x86_64-iphonesimulator-gcc118 x86_64-iphonesimulator-gcc
117 x86_64-linux-gcc119 x86_64-linux-gcc
118 x86_64-linux-icc120 x86_64-linux-icc
build/make/configure.sh+11−3
@@ -774,6 +774,10 @@ process_common_toolchain() { · 773 unmodified lines
774 tgt_isa=x86_64774 tgt_isa=x86_64
775 tgt_os=`echo $gcctarget | sed 's/.*\(darwin1[0-9]\).*/\1/'`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 x86_64*mingw32*)781 x86_64*mingw32*)
778 tgt_os=win64782 tgt_os=win64
779 ;;783 ;;
@@ -848,7 +852,7 @@ process_common_toolchain() { · 68 unmodified lines
848 # Handle darwin variants. Newer SDKs allow targeting older852 # Handle darwin variants. Newer SDKs allow targeting older
849 # platforms, so use the newest one available.853 # platforms, so use the newest one available.
850 case ${toolchain} in854 case ${toolchain} in
851 arm*-darwin*)855 arm*-darwin-)
852 add_cflags "-miphoneos-version-min=${IOS_VERSION_MIN}"856 add_cflags "-miphoneos-version-min=${IOS_VERSION_MIN}"
853 iphoneos_sdk_dir="$(show_darwin_sdk_path iphoneos)"857 iphoneos_sdk_dir="$(show_darwin_sdk_path iphoneos)"
854 if [ -d "${iphoneos_sdk_dir}" ]; then858 if [ -d "${iphoneos_sdk_dir}" ]; then
@@ -856,7 +860,7 @@ process_common_toolchain() { · 1 unmodified line
856 add_ldflags "-isysroot ${iphoneos_sdk_dir}"860 add_ldflags "-isysroot ${iphoneos_sdk_dir}"
857 fi861 fi
858 ;;862 ;;
859 x86*-darwin*)863 *-darwin*)
860 osx_sdk_dir="$(show_darwin_sdk_path macosx)"864 osx_sdk_dir="$(show_darwin_sdk_path macosx)"
861 if [ -d "${osx_sdk_dir}" ]; then865 if [ -d "${osx_sdk_dir}" ]; then
862 add_cflags "-isysroot ${osx_sdk_dir}"866 add_cflags "-isysroot ${osx_sdk_dir}"
@@ -914,6 +918,10 @@ process_common_toolchain() { · 51 unmodified lines
914 add_cflags "-mmacosx-version-min=10.15"918 add_cflags "-mmacosx-version-min=10.15"
915 add_ldflags "-mmacosx-version-min=10.15"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 *-iphonesimulator-*)925 *-iphonesimulator-*)
918 add_cflags "-miphoneos-version-min=${IOS_VERSION_MIN}"926 add_cflags "-miphoneos-version-min=${IOS_VERSION_MIN}"
919 add_ldflags "-miphoneos-version-min=${IOS_VERSION_MIN}"927 add_ldflags "-miphoneos-version-min=${IOS_VERSION_MIN}"
@@ -1087,7 +1095,7 @@ EOF · 167 unmodified lines
1087 soft_enable unit_tests1095 soft_enable unit_tests
1088 ;;1096 ;;
1089 1097
1090 darwin*)1098 darwin)
1091 if ! enabled external_build; then1099 if ! enabled external_build; then
1092 XCRUN_FIND="xcrun --sdk iphoneos --find"1100 XCRUN_FIND="xcrun --sdk iphoneos --find"
1093 CXX="$(${XCRUN_FIND} clang++)"1101 CXX="$(${XCRUN_FIND} clang++)"
configure+2−0
@@ -99,6 +99,7 @@ EOF · 98 unmodified lines
99# alphabetically by architecture, generic-gnu last.99# alphabetically by architecture, generic-gnu last.
100all_platforms="${all_platforms} arm64-android-gcc"100all_platforms="${all_platforms} arm64-android-gcc"
101all_platforms="${all_platforms} arm64-darwin-gcc"101all_platforms="${all_platforms} arm64-darwin-gcc"
102all_platforms="${all_platforms} arm64-darwin20-gcc"
102all_platforms="${all_platforms} arm64-linux-gcc"103all_platforms="${all_platforms} arm64-linux-gcc"
103all_platforms="${all_platforms} arm64-win64-gcc"104all_platforms="${all_platforms} arm64-win64-gcc"
104all_platforms="${all_platforms} arm64-win64-vs15"105all_platforms="${all_platforms} arm64-win64-vs15"
@@ -150,6 +151,7 @@ all_platforms="${all_platforms} x86_64-darwin16-gcc" · 45 unmodified lines
150all_platforms="${all_platforms} x86_64-darwin17-gcc"151all_platforms="${all_platforms} x86_64-darwin17-gcc"
151all_platforms="${all_platforms} x86_64-darwin18-gcc"152all_platforms="${all_platforms} x86_64-darwin18-gcc"
152all_platforms="${all_platforms} x86_64-darwin19-gcc"153all_platforms="${all_platforms} x86_64-darwin19-gcc"
154all_platforms="${all_platforms} x86_64-darwin20-gcc"
153all_platforms="${all_platforms} x86_64-iphonesimulator-gcc"155all_platforms="${all_platforms} x86_64-iphonesimulator-gcc"
154all_platforms="${all_platforms} x86_64-linux-gcc"156all_platforms="${all_platforms} x86_64-linux-gcc"
155all_platforms="${all_platforms} x86_64-linux-icc"157all_platforms="${all_platforms} x86_64-linux-icc"

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t