From 7cfa8d364797aed267285124a32b5cc5e1cd4794 Mon Sep 17 00:00:00 2001 From: Chris Liddell Date: Mon, 17 Aug 2020 13:14:18 +0100 Subject: Bug 702360: Allow @loader_path on darwin so build As this is change in behaviour, it's optional. The configure script now uses (if set) a environment variable called "DARWIN_LDFLAGS_SO_PREFIX" - included "DARWIN" because it only applies to DARWIN derived systems. This allows the caller to use: ./configure DARWIN_LDFLAGS_SO_PREFIX="@loader_path/" Thus meaning the build will use loader_path rather than "@executable_path". Configuring/building without that environment variable will retain the current behaviour. --- configure.ac | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index d27222459..59bdfd911 100644 --- a/configure.ac +++ b/configure.ac @@ -3009,10 +3009,10 @@ case $host in ;; *-darwin*) DYNAMIC_CFLAGS="-fPIC $DYNAMIC_CFLAGS" - GS_DYNAMIC_LDFLAGS="-dynamiclib -install_name \$(GS_SONAME_MAJOR_MINOR)" - PCL_DYNAMIC_LDFLAGS="-dynamiclib -install_name \$(PCL_SONAME_MAJOR_MINOR)" - XPS_DYNAMIC_LDFLAGS="-dynamiclib -install_name \$(XPS_SONAME_MAJOR_MINOR)" - PDL_DYNAMIC_LDFLAGS="-dynamiclib -install_name \$(GPDL_SONAME_MAJOR_MINOR)" + GS_DYNAMIC_LDFLAGS="-dynamiclib -install_name $DARWIN_LDFLAGS_SO_PREFIX\$(GS_SONAME_MAJOR_MINOR)" + PCL_DYNAMIC_LDFLAGS="-dynamiclib -install_name $DARWIN_LDFLAGS_SO_PREFIX\$(PCL_SONAME_MAJOR_MINOR)" + XPS_DYNAMIC_LDFLAGS="-dynamiclib -install_name $DARWIN_LDFLAGS_SO_PREFIX\$(XPS_SONAME_MAJOR_MINOR)" + PDL_DYNAMIC_LDFLAGS="-dynamiclib -install_name $DARWIN_LDFLAGS_SO_PREFIX\$(GPDL_SONAME_MAJOR_MINOR)" DYNAMIC_LIBS="" SO_LIB_EXT=".dylib" ;; -- cgit v1.2.1