Skip to content

Commit 95181ff

Browse files
authored
macOS related patches for 10.45 (#668)
* autotools: retire conditional for debug build likely added by mistake, the functionality works through `--enable-debug` instead. * maint: allow selecting compiler for ManyConfigTests Instead of hardcoding the compiler as `cc`, let a CC environment variable dictate which compiler to use. For example, in macOS/arm64 where the GNU compiler is provided by brew the following will allow using it instead of the system compiler (which ALSO answers to `gcc` even though is `clang`) % CC=gcc-13 maint/ManyConfigTests
1 parent c99e809 commit 95181ff

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

configure.ac

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -569,7 +569,6 @@ AC_CHECK_HEADERS([sys/wait.h], [HAVE_SYS_WAIT_H=1])
569569
AM_CONDITIONAL(WITH_PCRE2_8, test "x$enable_pcre2_8" = "xyes")
570570
AM_CONDITIONAL(WITH_PCRE2_16, test "x$enable_pcre2_16" = "xyes")
571571
AM_CONDITIONAL(WITH_PCRE2_32, test "x$enable_pcre2_32" = "xyes")
572-
AM_CONDITIONAL(WITH_DEBUG, test "x$enable_debug" = "xyes")
573572
AM_CONDITIONAL(WITH_REBUILD_CHARTABLES, test "x$enable_rebuild_chartables" = "xyes")
574573
AM_CONDITIONAL(WITH_JIT, test "x$enable_jit" = "xyes")
575574
AM_CONDITIONAL(WITH_UNICODE, test "x$enable_unicode" = "xyes")

maint/ManyConfigTests

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,11 +110,12 @@ tmp=/tmp/pcre2testing
110110

111111
CFLAGS="-g"
112112
OFLAGS="-O0"
113+
CC="${CC:=cc}"
113114
ISGCC=0
114115

115116
# If the compiler is gcc, add a lot of warning switches.
116117

117-
cc --version >/tmp/pcre2ccversion 2>/dev/null
118+
$CC --version >/tmp/pcre2ccversion 2>/dev/null
118119
if [ $? -eq 0 ] && grep GCC /tmp/pcre2ccversion >/dev/null; then
119120
ISGCC=1
120121
CFLAGS="$CFLAGS -Wall"

src/pcre2_jit_neon_inc.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ POSSIBILITY OF SUCH DAMAGE.
8787
#pragma GCC diagnostic ignored "-Wdeclaration-after-statement"
8888
#endif
8989

90-
#if (defined(__GNUC__) && __SANITIZE_ADDRESS__) \
90+
#if (defined(__GNUC__) && defined(__SANITIZE_ADDRESS__) && __SANITIZE_ADDRESS__ ) \
9191
|| (defined(__clang__) \
9292
&& ((__clang_major__ == 3 && __clang_minor__ >= 3) || (__clang_major__ > 3)))
9393
__attribute__((no_sanitize_address))

0 commit comments

Comments
 (0)