From 338955046d90b12b5880ccc21cf5f60d12aa5b46 Mon Sep 17 00:00:00 2001 From: Matthew Flatt Date: Thu, 28 Nov 2019 16:27:56 -0700 Subject: [PATCH] configure: repair for `--enable-embedfw` `-S` needed for `strip` with some(?) versions of the Mac build tools. --- racket/src/ac/sdk_show.m4 | 1 + racket/src/cfg-racket | 4 ++++ racket/src/cs/c/configure | 1 + racket/src/racket/configure.ac | 3 +++ 4 files changed, 9 insertions(+) diff --git a/racket/src/ac/sdk_show.m4 b/racket/src/ac/sdk_show.m4 index 994c856e16..149f44578c 100644 --- a/racket/src/ac/sdk_show.m4 +++ b/racket/src/ac/sdk_show.m4 @@ -2,6 +2,7 @@ show_explicitly_disabled "${enable_mac64}" "64-bit Mac OS" show_explicitly_enabled "${enable_libfw}" "Frameworks-to-system" show_explicitly_enabled "${enable_userfw}" "Frameworks-to-user" +show_explicitly_enabled "${enable_embedfw}" "embedded frameworks" if test "${enable_sdk}" != "" ; then if test "${enable_sdk5}" != "" ; then diff --git a/racket/src/cfg-racket b/racket/src/cfg-racket index f7d0283dd9..a02a288dc0 100755 --- a/racket/src/cfg-racket +++ b/racket/src/cfg-racket @@ -3280,6 +3280,7 @@ show_explicitly_disabled "${enable_mac64}" "64-bit Mac OS" show_explicitly_enabled "${enable_libfw}" "Frameworks-to-system" show_explicitly_enabled "${enable_userfw}" "Frameworks-to-user" +show_explicitly_enabled "${enable_embedfw}" "embedded frameworks" if test "${enable_sdk}" != "" ; then if test "${enable_sdk5}" != "" ; then @@ -5085,6 +5086,9 @@ $as_echo "#define HAVE_STDINT_H 1" >>confdefs.h FRAMEWORK_PREFIX='$(FRAMEWORK_REL_PREFIX)' fi fi + if test "${enable_embedfw}" = "yes" ; then + strip_needs_dash_s=yes + fi else PREFLAGS="$PREFLAGS -DXONX " LIBS="$LIBS -framework CoreFoundation" diff --git a/racket/src/cs/c/configure b/racket/src/cs/c/configure index fc44f307c4..085c0e32c2 100755 --- a/racket/src/cs/c/configure +++ b/racket/src/cs/c/configure @@ -2781,6 +2781,7 @@ show_explicitly_disabled "${enable_mac64}" "64-bit Mac OS" show_explicitly_enabled "${enable_libfw}" "Frameworks-to-system" show_explicitly_enabled "${enable_userfw}" "Frameworks-to-user" +show_explicitly_enabled "${enable_embedfw}" "embedded frameworks" if test "${enable_sdk}" != "" ; then if test "${enable_sdk5}" != "" ; then diff --git a/racket/src/racket/configure.ac b/racket/src/racket/configure.ac index ed0c5bd171..e37bdef30c 100644 --- a/racket/src/racket/configure.ac +++ b/racket/src/racket/configure.ac @@ -753,6 +753,9 @@ case "$host_os" in FRAMEWORK_PREFIX='$(FRAMEWORK_REL_PREFIX)' fi fi + if test "${enable_embedfw}" = "yes" ; then + strip_needs_dash_s=yes + fi else PREFLAGS="$PREFLAGS -DXONX " LIBS="$LIBS -framework CoreFoundation"