[m-rev.] diff: re-enable executable stripping on Mac OS X

[Julien Fischer]

Branches: 14.01, master
======================

Re-enable executable stripping on Mac OS X.

configure.ac:
 	Pass -x to strip when linking an executable against Mercury shared
 	libraries on Mac OS X.

 	Make the up-to-date check require {14.01.-beta,rotd}-2014-05-05 or
         later.

scripts/Mercury.config.in:
 	Set the default values of --strip-executable-{shared,static}-flags.

Julien.

diff --git a/configure.ac b/configure.ac
index 01e039b..720500a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -515,14 +515,10 @@ EOF
          $BOOTSTRAP_MC \
              --verbose \
              --halt-at-warn \
-            --trace-io-builtins-2006-08-14 \
              $link_static_opt conftest \
-            --compound-compare-builtins-2007-07-09 \
              --erlang-native-code \
-            --no-no-det-warning-compound-compare-2007-07-17 \
-            --foreign-enum-switch-fix \
+            --strip-executable-2014-05-05 \
              --no-ssdb \
-            --store-at-ref-impure-2008-09-11 \
              </dev/null >&AC_FD_CC 2>&1 &&
          test "`./conftest 2>&1 | tr -d '\015'`" = "Hello, world" &&
          # Test for the --record-term-sizes-as-words option.
@@ -1046,6 +1042,8 @@ if test "$ac_microsoft" = "yes" ; then
      LD_LIBFLAGS_FOR_DEBUG="-DEBUG"
      LD_STRIP_FLAG=
      STRIP_EXE=
+    STRIP_EXE_SHARED_FLAGS=
+    STRIP_EXE_STATIC_FLAGS=

      USING_MICROSOFT_CL_COMPILER="yes"
      FIX_PATH_FOR_CC="$CYGPATH"
@@ -1072,6 +1070,8 @@ else

      LD_STRIP_FLAG="-s"
      STRIP_EXE=""
+    STRIP_EXE_SHARED_FLAGS=""
+    STRIP_EXE_STATIC_FLAGS=""

      # The `-s' linker option is deprecated on Darwin 9+ and has no effect other
      # than causing the linker to emit a warning. Call the strip tool directly.
@@ -1079,11 +1079,9 @@ else
      case "$host" in
          *apple*darwin*)
              LD_STRIP_FLAG=""
-            # XXX we should strip executables as a separate step on Mac OS X,
-            # but doing so correctly requires different flags depending on the
-            # setting of --mercury-linkage and we do not (yet) provide such
-            # fine grained control over executable stripping.
-            # STRIP_EXE="strip"
+            STRIP_EXE="strip"
+            STRIP_EXE_SHARED_FLAGS="-x"
+            STRIP_EXE_STATIC_FLAGS=""
              ;;
      esac

@@ -1145,6 +1143,8 @@ AC_SUBST(LDFLAGS_FOR_DEBUG)
  AC_SUBST(LD_LIBFLAGS_FOR_DEBUG)
  AC_SUBST(LD_STRIP_FLAG)
  AC_SUBST(STRIP_EXE)
+AC_SUBST(STRIP_EXE_SHARED_FLAGS)
+AC_SUBST(STRIP_EXE_STATIC_FLAGS)
  AC_SUBST(LDFLAGS_FOR_TRACE)
  AC_SUBST(LD_LIBFLAGS_FOR_TRACE)
  AC_SUBST(USING_MICROSOFT_CL_COMPILER)
diff --git a/scripts/Mercury.config.in b/scripts/Mercury.config.in
index 5e4f438..5ff6f6c 100644
--- a/scripts/Mercury.config.in
+++ b/scripts/Mercury.config.in
@@ -87,6 +87,8 @@ DEFAULT_MCFLAGS=\
  		--link-executable-command "@LINK_EXE@" \
  		--link-shared-lib-command "@LINK_SHARED_OBJ@" \
  		--strip-executable-command "@STRIP_EXE@" \
+		--strip-executable-shared-flags "@STRIP_EXE_SHARED_FLAGS@" \
+		--strip-executable-static-flags "@STRIP_EXE_STATIC_FLAGS@" \
  		--trace-libs "@TRACE_BASE_LIBS_SYSTEM@" \
  		--thread-libs "@THREAD_LIBS@" \
  		--hwloc-libs "@HWLOC_LIBS@" \