Commits
wwcv authored and Frank Schima committed b384b6a9bcf
1 - | --- build/make/configure.sh.orig 2019-09-25 18:56:09.000000000 -0400 |
2 - | +++ build/make/configure.sh 2019-09-25 18:44:14.000000000 -0400 |
3 - | |
4 - | |
5 - | # detect tgt_os |
6 - | case "$gcctarget" in |
7 - | - *darwin10*) |
8 - | + *darwin*) |
9 - | tgt_isa=x86_64 |
10 - | - tgt_os=darwin10 |
11 - | - ;; |
12 - | - *darwin11*) |
13 - | - tgt_isa=x86_64 |
14 - | - tgt_os=darwin11 |
15 - | - ;; |
16 - | - *darwin12*) |
17 - | - tgt_isa=x86_64 |
18 - | - tgt_os=darwin12 |
19 - | - ;; |
20 - | - *darwin13*) |
21 - | - tgt_isa=x86_64 |
22 - | - tgt_os=darwin13 |
23 - | - ;; |
24 - | - *darwin14*) |
25 - | - tgt_isa=x86_64 |
26 - | - tgt_os=darwin14 |
27 - | - ;; |
28 - | - *darwin15*) |
29 - | - tgt_isa=x86_64 |
30 - | - tgt_os=darwin15 |
31 - | - ;; |
32 - | - *darwin16*) |
33 - | - tgt_isa=x86_64 |
34 - | - tgt_os=darwin16 |
35 - | - ;; |
36 - | - *darwin17*) |
37 - | - tgt_isa=x86_64 |
38 - | - tgt_os=darwin17 |
39 - | + tgt_os=darwin |
40 - | ;; |
41 - | x86_64*mingw32*) |
42 - | tgt_os=win64 |
43 - | |
1 + | --- build/make/configure.sh.orig 2019-09-25 18:44:14.000000000 -0400 |
2 + | +++ build/make/configure.sh 2019-10-23 15:07:31.000000000 -0500 |
3 + | |
44 4 | fi |
45 5 | ;; |
46 6 | x86*-darwin*) |
47 7 | - osx_sdk_dir="$(show_darwin_sdk_path macosx)" |
48 8 | + osx_sdk_dir="$(configure.sdkroot)" |
49 9 | if [ -d "${osx_sdk_dir}" ]; then |
50 10 | add_cflags "-isysroot ${osx_sdk_dir}" |
51 11 | add_ldflags "-isysroot ${osx_sdk_dir}" |
52 - | |
53 - | ;; |
54 - | esac |
55 - | |
56 - | - case ${toolchain} in |
57 - | - *-darwin8-*) |
58 - | - add_cflags "-mmacosx-version-min=10.4" |
59 - | - add_ldflags "-mmacosx-version-min=10.4" |
60 - | - ;; |
61 - | - *-darwin9-*) |
62 - | - add_cflags "-mmacosx-version-min=10.5" |
63 - | - add_ldflags "-mmacosx-version-min=10.5" |
64 - | - ;; |
65 - | - *-darwin10-*) |
66 - | - add_cflags "-mmacosx-version-min=10.6" |
67 - | - add_ldflags "-mmacosx-version-min=10.6" |
68 - | - ;; |
69 - | - *-darwin11-*) |
70 - | - add_cflags "-mmacosx-version-min=10.7" |
71 - | - add_ldflags "-mmacosx-version-min=10.7" |
72 - | - ;; |
73 - | - *-darwin12-*) |
74 - | - add_cflags "-mmacosx-version-min=10.8" |
75 - | - add_ldflags "-mmacosx-version-min=10.8" |
76 - | - ;; |
77 - | - *-darwin13-*) |
78 - | - add_cflags "-mmacosx-version-min=10.9" |
79 - | - add_ldflags "-mmacosx-version-min=10.9" |
80 - | - ;; |
81 - | - *-darwin14-*) |
82 - | - add_cflags "-mmacosx-version-min=10.10" |
83 - | - add_ldflags "-mmacosx-version-min=10.10" |
84 - | - ;; |
85 - | - *-darwin15-*) |
86 - | - add_cflags "-mmacosx-version-min=10.11" |
87 - | - add_ldflags "-mmacosx-version-min=10.11" |
88 - | - ;; |
89 - | - *-darwin16-*) |
90 - | - add_cflags "-mmacosx-version-min=10.12" |
91 - | - add_ldflags "-mmacosx-version-min=10.12" |
92 - | - ;; |
93 - | - *-darwin17-*) |
94 - | - add_cflags "-mmacosx-version-min=10.13" |
95 - | - add_ldflags "-mmacosx-version-min=10.13" |
96 - | - ;; |
97 - | - *-iphonesimulator-*) |
98 - | - add_cflags "-miphoneos-version-min=${IOS_VERSION_MIN}" |
99 - | - add_ldflags "-miphoneos-version-min=${IOS_VERSION_MIN}" |
100 - | - iossim_sdk_dir="$(show_darwin_sdk_path iphonesimulator)" |
101 - | - if [ -d "${iossim_sdk_dir}" ]; then |
102 - | - add_cflags "-isysroot ${iossim_sdk_dir}" |
103 - | - add_ldflags "-isysroot ${iossim_sdk_dir}" |
104 - | - fi |
105 - | - ;; |
106 - | - esac |
107 - | - |
108 - | # Handle Solaris variants. Solaris 10 needs -lposix4 |
109 - | case ${toolchain} in |
110 - | sparc-solaris-*) |