39 lines
1.1 KiB
Diff
39 lines
1.1 KiB
Diff
From 842cc30948723f3fe3e7e71ebcb18191ae5324ed Mon Sep 17 00:00:00 2001
|
|
From: ph10 <ph10@6239d852-aaf2-0410-a92c-79f79f948069>
|
|
Date: Tue, 26 May 2020 15:18:35 +0000
|
|
Subject: [PATCH 2/2] Fix previous commit: include CET_CFLAGS in 16-bit and
|
|
32-bit builds under AutoTools.
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
git-svn-id: svn://vcs.exim.org/pcre2/code/trunk@1257 6239d852-aaf2-0410-a92c-79f79f948069
|
|
Signed-off-by: Petr Písař <ppisar@redhat.com>
|
|
---
|
|
Makefile.am | 2 ++
|
|
1 file changed, 2 insertions(+)
|
|
|
|
diff --git a/Makefile.am b/Makefile.am
|
|
index af6b92b..6a771a5 100644
|
|
--- a/Makefile.am
|
|
+++ b/Makefile.am
|
|
@@ -405,6 +405,7 @@ nodist_libpcre2_16_la_SOURCES = \
|
|
libpcre2_16_la_CFLAGS = \
|
|
-DPCRE2_CODE_UNIT_WIDTH=16 \
|
|
$(VISIBILITY_CFLAGS) \
|
|
+ $(CET_CFLAGS) \
|
|
$(AM_CFLAGS)
|
|
libpcre2_16_la_LIBADD =
|
|
endif # WITH_PCRE2_16
|
|
@@ -418,6 +419,7 @@ nodist_libpcre2_32_la_SOURCES = \
|
|
libpcre2_32_la_CFLAGS = \
|
|
-DPCRE2_CODE_UNIT_WIDTH=32 \
|
|
$(VISIBILITY_CFLAGS) \
|
|
+ $(CET_CFLAGS) \
|
|
$(AM_CFLAGS)
|
|
libpcre2_32_la_LIBADD =
|
|
endif # WITH_PCRE2_32
|
|
--
|
|
2.25.4
|
|
|