use -headerpad_max_install_names when linking shared libs on Mac

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24339 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/aclocal.m4 b/aclocal.m4
index e1b5d4f8bf841743843729a16f36a4abe89b7d7d..01c7309c6fde6c2cb8d8874a3591f428c1eaaecd 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1388,16 +1388,16 @@ EOF
             chmod +x shared-ld-sh
 
             dnl Use the shared-ld-sh helper script
             chmod +x shared-ld-sh
 
             dnl Use the shared-ld-sh helper script

-            SHARED_LD_CC="`pwd`/shared-ld-sh -dynamiclib -o"
-            SHARED_LD_MODULE_CC="`pwd`/shared-ld-sh -bundle -o"
+            SHARED_LD_CC="`pwd`/shared-ld-sh -dynamiclib -headerpad_max_install_names -o"
+            SHARED_LD_MODULE_CC="`pwd`/shared-ld-sh -bundle -headerpad_max_install_names -o"

             SHARED_LD_CXX="$SHARED_LD_CC"
             SHARED_LD_MODULE_CXX="$SHARED_LD_MODULE_CC"
         else
             dnl Use the -single_module flag and let the linker do it for us
             SHARED_LD_CXX="$SHARED_LD_CC"
             SHARED_LD_MODULE_CXX="$SHARED_LD_MODULE_CC"
         else
             dnl Use the -single_module flag and let the linker do it for us

-            SHARED_LD_CC="\${CC} -dynamiclib -single_module -o"
-            SHARED_LD_MODULE_CC="\${CC} -bundle -single_module -o"
-            SHARED_LD_CXX="\${CXX} -dynamiclib -single_module -o"
-            SHARED_LD_MODULE_CXX="\${CXX} -bundle -single_module -o"
+            SHARED_LD_CC="\${CC} -dynamiclib -single_module -headerpad_max_install_names -o"
+            SHARED_LD_MODULE_CC="\${CC} -bundle -single_module -headerpad_max_install_names -o"
+            SHARED_LD_CXX="\${CXX} -dynamiclib -single_module -headerpad_max_install_names -o"
+            SHARED_LD_MODULE_CXX="\${CXX} -bundle -single_module -headerpad_max_install_names -o"

         fi
 
         PIC_FLAG="-dynamic -fPIC"
         fi
 
         PIC_FLAG="-dynamic -fPIC"

diff --git a/configure b/configure
index 821f62ccb6d71b095b84aa5b6e7572fe4a6bff8c..30b955334d35a50c3d5a3b5bc5b05668a0211ef0 100755 (executable)
--- a/configure
+++ b/configure
@@ -34967,15 +34967,15 @@ exit 0
 EOF
             chmod +x shared-ld-sh
 
 EOF
             chmod +x shared-ld-sh
 

-                        SHARED_LD_CC="`pwd`/shared-ld-sh -dynamiclib -o"
-            SHARED_LD_MODULE_CC="`pwd`/shared-ld-sh -bundle -o"
+                        SHARED_LD_CC="`pwd`/shared-ld-sh -dynamiclib -headerpad_max_install_names -o"
+            SHARED_LD_MODULE_CC="`pwd`/shared-ld-sh -bundle -headerpad_max_install_names -o"

             SHARED_LD_CXX="$SHARED_LD_CC"
             SHARED_LD_MODULE_CXX="$SHARED_LD_MODULE_CC"
         else
             SHARED_LD_CXX="$SHARED_LD_CC"
             SHARED_LD_MODULE_CXX="$SHARED_LD_MODULE_CC"
         else

-                        SHARED_LD_CC="\${CC} -dynamiclib -single_module -o"
-            SHARED_LD_MODULE_CC="\${CC} -bundle -single_module -o"
-            SHARED_LD_CXX="\${CXX} -dynamiclib -single_module -o"
-            SHARED_LD_MODULE_CXX="\${CXX} -bundle -single_module -o"
+                        SHARED_LD_CC="\${CC} -dynamiclib -single_module -headerpad_max_install_names -o"
+            SHARED_LD_MODULE_CC="\${CC} -bundle -single_module -headerpad_max_install_names -o"
+            SHARED_LD_CXX="\${CXX} -dynamiclib -single_module -headerpad_max_install_names -o"
+            SHARED_LD_MODULE_CXX="\${CXX} -bundle -single_module -headerpad_max_install_names -o"

         fi
 
         PIC_FLAG="-dynamic -fPIC"
         fi
 
         PIC_FLAG="-dynamic -fPIC"


@@ -35316,8 +35316,6 @@ fi
 
 
 
 
 
 

-
-

     # Check whether --enable-precomp-headers or --disable-precomp-headers was given.
 if test "${enable_precomp_headers+set}" = set; then
   enableval="$enable_precomp_headers"
     # Check whether --enable-precomp-headers or --disable-precomp-headers was given.
 if test "${enable_precomp_headers+set}" = set; then
   enableval="$enable_precomp_headers"