[Fontconfig] fontconfig: Branch 'main'

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Tue Jun 6 06:25:19 UTC 2023


 src/meson.build |    6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

New commits:
commit ce182817b488ba74c462a6edebecebf77c0a2521
Author: Xavier Claessens <xavier.claessens at collabora.com>
Date:   Thu Jun 1 08:26:49 2023 -0400

    meson: Support any compiler with gcc or msvc argument syntax
    
    This includes e.g. clang-cl.

diff --git a/src/meson.build b/src/meson.build
index 34ccd8c..365f19a 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -31,12 +31,10 @@ fc_sources = [
 
 # FIXME: obviously fragile, cc.preprocess would be sweet
 cpp = cc.cmd_array()
-if cc.get_id() == 'gcc'
+if cc.get_argument_syntax() == 'gcc'
   cpp += ['-E', '-P']
-elif cc.get_id() == 'msvc'
+elif cc.get_argument_syntax() == 'msvc'
   cpp += ['/EP']
-elif cc.get_id() == 'clang'
-  cpp += ['-E', '-P']
 else
   error('FIXME: implement cc.preprocess')
 endif


More information about the Fontconfig mailing list