forked frompostgres/postgres
- Notifications
You must be signed in to change notification settings - Fork6
Commitee6c08b
committed
Back off using -isysroot on Darwin.
Rethink the solution applied in commit5e22171 to get PL/Tcl tobuild on macOS Mojave. I feared that adding -isysroot globally mighthave undesirable consequences, and sure enough Jakob Egger reportedone: it complicates building extensions with a different Xcode versionthan was used for the core server. (I find that a risky propositionin general, but apparently it works most of the time, so we shouldn'tbreak it if we don't have to.)We'd already adopted the solution for PL/Perl of inserting the sysrootpath directly into the -I switches used to find Perl's headers, and wecan do the same thing for PL/Tcl by changing the -iwithsysroot switchthat Apple's tclConfig.sh reports. This restricts the risks to PL/Perland PL/Tcl themselves and directly-dependent extensions, which is a lotmore pleasing in general than a global -isysroot switch.Along the way, tighten the test to see if we need to inject the sysrootpath into $perl_includedir, as I'd speculated about upthread but notgotten round to doing.As before, back-patch to all supported versions.Discussion:https://postgr.es/m/20840.1537850987@sss.pgh.pa.us1 parent7bee1d5 commitee6c08b
3 files changed
+17
-6
lines changedLines changed: 6 additions & 1 deletion
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
7976 | 7976 |
| |
7977 | 7977 |
| |
7978 | 7978 |
| |
7979 |
| - | |
| 7979 | + | |
7980 | 7980 |
| |
7981 | 7981 |
| |
7982 | 7982 |
| |
| |||
16207 | 16207 |
| |
16208 | 16208 |
| |
16209 | 16209 |
| |
| 16210 | + | |
| 16211 | + | |
| 16212 | + | |
| 16213 | + | |
| 16214 | + | |
16210 | 16215 |
| |
16211 | 16216 |
| |
16212 | 16217 |
| |
|
Lines changed: 6 additions & 1 deletion
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
972 | 972 |
| |
973 | 973 |
| |
974 | 974 |
| |
975 |
| - | |
| 975 | + | |
976 | 976 |
| |
977 | 977 |
| |
978 | 978 |
| |
| |||
2102 | 2102 |
| |
2103 | 2103 |
| |
2104 | 2104 |
| |
| 2105 | + | |
| 2106 | + | |
| 2107 | + | |
| 2108 | + | |
| 2109 | + | |
2105 | 2110 |
| |
2106 | 2111 |
| |
2107 | 2112 |
| |
|
Lines changed: 5 additions & 4 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
3 | 3 |
| |
4 | 4 |
| |
5 | 5 |
| |
6 |
| - | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
7 | 9 |
| |
8 | 10 |
| |
9 | 11 |
| |
| 12 | + | |
10 | 13 |
| |
11 |
| - | |
12 |
| - | |
13 |
| - | |
| 14 | + | |
14 | 15 |
| |
15 | 16 |
| |
16 | 17 |
| |
|
0 commit comments
Comments
(0)