Use system pcre2 library for tcc

rizinorg · Jan 31, 2024 · 5436a83 · 5436a83
1 parent a5c9006
commit 5436a83
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/.github/workflows/tcc.yml b/.github/workflows/tcc.yml
@@ -62,7 +62,7 @@ jobs:
 
     - name: Install dependencies
       run: |
-          sudo apt-get --assume-yes install python3-wheel python3-setuptools
+          sudo apt-get --assume-yes install python3-wheel python3-setuptools libpcre2-dev
           sudo python3 -m pip install ninja
 
     - name: Checkout meson from ret2libc git

diff --git a/meson.build b/meson.build
@@ -198,7 +198,11 @@ endif
 # Handle PCRE2
 pcre2_dep_opt = get_option('use_sys_pcre2')
 pcre2_dep = disabler()
-if pcre2_dep_opt.enabled() or pcre2_dep_opt.auto()
+if cc.get_id() == 'tcc'
+  # We require the system library for tcc, because tcc doesn't support
+  # the MSVC asm syntax PCRE2 uses.
+  pcre2_dep = dependency('libpcre2-8', required: true, static: true)
+elif pcre2_dep_opt.enabled() or pcre2_dep_opt.auto()
   pcre2_dep = dependency('libpcre2-8', required: false, static: true)
   if not pcre2_dep.found()
     pcre2_dep = cc.find_library('pcre2', required: true, static: true)