aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2014-07-05 15:22:03 -0700
committerGuy Harris <guy@alum.mit.edu>2014-07-05 22:22:44 +0000
commit318205e6999314d4fb0e0272ca4db2d347501f98 (patch)
tree38a4b1dd6f3f961fe317d6499867bdeac1d2754d
parent42b537ea49f1a54dff1528343a37aca35c590c62 (diff)
Fix an error caught by enum-conversion warnings.
(Strong typing is for weak minds. Human minds are weak. Therefore, strong typing is for human minds.) Change-Id: I099b85e98f3b9742b1addd8d260b3e94ca7add31 Reviewed-on: https://code.wireshark.org/review/2866 Reviewed-by: Guy Harris <guy@alum.mit.edu>
-rw-r--r--configure.ac7
1 files changed, 5 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac
index 1522170bae..13347884f6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1110,6 +1110,9 @@ darwin*)
#
LDFLAGS_SHAREDLIB="-Wl,-single_module"
#
+ # Add -Wl,-headerpad_max_install_names to the LDFLAGS, as
+ # code-signing issues is running out of padding space.
+ #
# Add -Wl,-search_paths_first to make sure that if we search
# directories A and B, in that order, for a given library, a
# non-shared version in directory A, rather than a shared
@@ -1125,8 +1128,8 @@ darwin*)
# libraries in the rpath, rather than having a script tweak
# DYLD_LIBRARY_PATH.
#
- LDFLAGS="-Wl,-search_paths_first -Wl,-rpath,@executable_path/../lib -Wl,-rpath,@executable_path/../Frameworks -Wl,-rpath,/usr/local/lib $LDFLAGS"
- AC_MSG_RESULT([Apple linker - added -Wl,-single_module and -Wl,-search_paths_first, and rpaths])
+ LDFLAGS="-Wl,-headerpad_max_install_names -Wl,-search_paths_first -Wl,-rpath,@executable_path/../lib -Wl,-rpath,@executable_path/../Frameworks -Wl,-rpath,/usr/local/lib $LDFLAGS"
+ AC_MSG_RESULT([Apple linker - added -Wl,-single_module to shared library linker flags and -Wl,-headerpad_max_install_names -Wl,-search_paths_first and rpaths to all linker flags])
;;
cygwin*)
#