diff options
| author | Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> | 2023-12-28 09:21:12 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-28 09:21:12 (GMT) |
| commit | 72073ca5603bbd8d8a00b51fe508d3465f95f634 (patch) | |
| tree | 5067020626535e4c7a596a0d24f1956908f6aa62 | |
| parent | c1b396cdf3197581035c9a94f92d4151b2f57e80 (diff) | |
| download | cpython-72073ca5603bbd8d8a00b51fe508d3465f95f634.zip cpython-72073ca5603bbd8d8a00b51fe508d3465f95f634.tar.gz cpython-72073ca5603bbd8d8a00b51fe508d3465f95f634.tar.bz2 | |
[3.12] gh-110459: Make sure --with-openssl-rpath works on macOS (GH-113441) (#113535)
gh-110459: Make sure --with-openssl-rpath works on macOS (GH-113441)
* gh-110459: Make sure --with-openssl-rpath works on macOS
On macOS the `-rpath` linker flag is spelled differently
than on on platforms.
(cherry picked from commit cc13eabc7ce08accf49656e258ba500f74a1dae8)
Co-authored-by: Ronald Oussoren <ronaldoussoren@mac.com>
| -rw-r--r-- | Misc/NEWS.d/next/macOS/2023-12-23-22-41-07.gh-issue-110459.NaMBJy.rst | 2 | ||||
| -rwxr-xr-x | configure | 7 | ||||
| -rw-r--r-- | configure.ac | 7 |
3 files changed, 14 insertions, 2 deletions
diff --git a/Misc/NEWS.d/next/macOS/2023-12-23-22-41-07.gh-issue-110459.NaMBJy.rst b/Misc/NEWS.d/next/macOS/2023-12-23-22-41-07.gh-issue-110459.NaMBJy.rst new file mode 100644 index 0000000..44ffd85 --- /dev/null +++ b/Misc/NEWS.d/next/macOS/2023-12-23-22-41-07.gh-issue-110459.NaMBJy.rst @@ -0,0 +1,2 @@ +Running ``configure ... --with-openssl-rpath=X/Y/Z`` no longer fails to detect +OpenSSL on macOS. @@ -28114,7 +28114,12 @@ then : else $as_nop - rpath_arg="-Wl,-rpath=" + if test "$ac_sys_system" = "Darwin" + then + rpath_arg="-Wl,-rpath," + else + rpath_arg="-Wl,-rpath=" + fi fi diff --git a/configure.ac b/configure.ac index bd2be94..4ae70a1 100644 --- a/configure.ac +++ b/configure.ac @@ -7002,7 +7002,12 @@ AX_CHECK_OPENSSL([have_openssl=yes],[have_openssl=no]) AS_VAR_IF([GNULD], [yes], [ rpath_arg="-Wl,--enable-new-dtags,-rpath=" ], [ - rpath_arg="-Wl,-rpath=" + if test "$ac_sys_system" = "Darwin" + then + rpath_arg="-Wl,-rpath," + else + rpath_arg="-Wl,-rpath=" + fi ]) AC_MSG_CHECKING([for --with-openssl-rpath]) |