Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commit175f716

Browse files
committed
Further tweaking of PG_SYSROOT heuristics for macOS.
It emerges that in some phases of the moon (perhaps to do withdirectory entry order?), xcrun will report that the SDK path is /Library/Developer/CommandLineTools/SDKs/MacOSX.sdkwhich is normally a symlink to a version-numbered sibling directory.Our heuristic to skip non-version-numbered pathnames was rejectingthat, which is the wrong thing to do. We'd still like to end upwith a version-numbered PG_SYSROOT value, but we can have that bydereferencing the symlink.Like the previous fix, back-patch to all supported versions.Discussion:https://postgr.es/m/522433.1611089678@sss.pgh.pa.us
1 parent0ddb529 commit175f716

File tree

1 file changed

+13
-6
lines changed

1 file changed

+13
-6
lines changed

‎src/template/darwin

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,20 @@
77
if test x"$PG_SYSROOT" = x"" ; then
88
# This is far more complicated than it ought to be. We first ask
99
# "xcrun --show-sdk-path", which seems to match the default -isysroot
10-
# setting of Apple's compilers. However, that may produce no result or
11-
# a result that is not version-specific (i.e., just ".../SDKs/MacOSX.sdk").
12-
# Using a version-specific sysroot seems desirable, so if there are not
13-
# digits in the directory name, try "xcrun --sdk macosx --show-sdk-path";
14-
# and if that still doesn't work, fall back to asking xcodebuild,
15-
# which is often a good deal slower.
10+
# setting of Apple's compilers.
1611
PG_SYSROOT=`xcrun --show-sdk-path 2>/dev/null`
12+
# That may fail, or produce a result that is not version-specific (i.e.,
13+
# just ".../SDKs/MacOSX.sdk"). Using a version-specific sysroot seems
14+
# desirable, so if the path is a non-version-specific symlink, expand it.
15+
if test -L "$PG_SYSROOT"; then
16+
if expr x"$PG_SYSROOT" : '.*[0-9]\.[0-9][^/]*$' >/dev/null ; then : okay
17+
else
18+
PG_SYSROOT=`expr "$PG_SYSROOT" : '\(.*\)/'`/`readlink "$PG_SYSROOT"`
19+
fi
20+
fi
21+
# If there are still not digits in the directory name, try
22+
# "xcrun --sdk macosx --show-sdk-path"; and if that still doesn't work,
23+
# fall back to asking xcodebuild, which is often a good deal slower.
1724
if expr x"$PG_SYSROOT" : '.*[0-9]\.[0-9][^/]*$' >/dev/null ; then : okay
1825
else
1926
PG_SYSROOT=`xcrun --sdk macosx --show-sdk-path 2>/dev/null`

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp