[glib/wip/pwithnall/962-drop-embedded-pcre] fixup! build: Drop the internal_pcre option in favour of the subproject
- From: Philip Withnall <pwithnall src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glib/wip/pwithnall/962-drop-embedded-pcre] fixup! build: Drop the internal_pcre option in favour of the subproject
- Date: Thu, 10 Jun 2021 14:48:41 +0000 (UTC)
commit 194277db9643cad135fb336fb0e656d0d40c29b8
Author: Philip Withnall <pwithnall endlessos org>
Date: Thu Jun 10 15:48:37 2021 +0100
fixup! build: Drop the internal_pcre option in favour of the subproject
meson.build | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
---
diff --git a/meson.build b/meson.build
index 16f65cf3c..3a12d9e72 100644
--- a/meson.build
+++ b/meson.build
@@ -1996,11 +1996,8 @@ endif
# Try again with the fallback
if not pcre.found()
pcre = dependency('libpcre', required : true, fallback : ['libpcre', 'pcre_dep'])
-endif
-
-use_pcre_static_flag = false
-
-if host_system == 'windows'
+ use_pcre_static_flag = true
+elif host_system == 'windows'
pcre_static = cc.links('''#define PCRE_STATIC
#include <pcre.h>
int main() {
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]