Fix compiling ObjC/ObjC++ on Windows/MinGW

Co-Authored-By: L. E. Segovia <[email protected]>
mesonbuild · Aug 8, 2024 · 81b151f · 81b151f
1 parent 43b80e0
commit 81b151f
Show file tree

Hide file tree

Showing 18 changed files with 60 additions and 3 deletions.
diff --git a/mesonbuild/cmake/toolchain.py b/mesonbuild/cmake/toolchain.py
@@ -188,6 +188,8 @@ def make_abs(exe: str) -> str:
             defaults[prefix + 'COMPILER'] = exe_list
             if comp_obj.get_id() == 'clang-cl':
                 defaults['CMAKE_LINKER'] = comp_obj.get_linker_exelist()
+            if lang.startswith('objc') and comp_obj.get_id().startswith('clang'):
+                defaults[f'{prefix}FLAGS'] = ['-D__STDC__=1']
 
         return defaults
 

diff --git a/mesonbuild/compilers/detect.py b/mesonbuild/compilers/detect.py
@@ -47,8 +47,8 @@
     defaults['cpp'] = ['icl', 'cl', 'c++', 'g++', 'clang++', 'clang-cl']
     # the binary flang-new will be renamed to flang in the foreseeable future
     defaults['fortran'] = ['ifort', 'gfortran', 'flang-new', 'flang', 'pgfortran', 'g95']
-    defaults['objc'] = ['clang-cl', 'gcc']
-    defaults['objcpp'] = ['clang-cl', 'g++']
+    defaults['objc'] = ['clang', 'clang-cl', 'gcc']
+    defaults['objcpp'] = ['clang++', 'clang-cl', 'g++']
     defaults['cs'] = ['csc', 'mcs']
 else:
     if platform.machine().lower() == 'e2k':

diff --git a/mesonbuild/compilers/mixins/clang.py b/mesonbuild/compilers/mixins/clang.py
@@ -58,6 +58,8 @@ def __init__(self, defines: T.Optional[T.Dict[str, str]]):
         # linkers don't have base_options.
         if isinstance(self.linker, AppleDynamicLinker):
             self.base_options.add(OptionKey('b_bitcode'))
+        elif isinstance(self.linker, MSVCDynamicLinker):
+            self.base_options.add(OptionKey('b_vscrt'))
         # All Clang backends can also do LLVM IR
         self.can_compile_suffixes.add('ll')
 

diff --git a/mesonbuild/compilers/mixins/visualstudio.py b/mesonbuild/compilers/mixins/visualstudio.py
@@ -383,6 +383,8 @@ def symbols_have_underscore_prefix(self, env: 'Environment') -> bool:
         # As a last resort, try search in a compiled binary
         return self._symbols_have_underscore_prefix_searchbin(env)
 
+    def get_pie_args(self) -> T.List[str]:
+        return []
 
 class MSVCCompiler(VisualStudioLikeCompiler):
 

diff --git a/mesonbuild/linkers/linkers.py b/mesonbuild/linkers/linkers.py
@@ -1326,6 +1326,9 @@ def import_library_args(self, implibname: str) -> T.List[str]:
     def rsp_file_syntax(self) -> RSPFileSyntax:
         return self.rsp_syntax
 
+    def get_pie_args(self) -> T.List[str]:
+        return []
+
 
 class MSVCDynamicLinker(VisualStudioLikeLinkerMixin, DynamicLinker):
 

diff --git a/test cases/cmake/24 mixing languages/meson.build b/test cases/cmake/24 mixing languages/meson.build
@@ -7,6 +7,12 @@ if not add_languages('objc', required : false)
   error('MESON_SKIP_TEST: No ObjC compiler')
 endif
 
+objc = meson.get_compiler('objc')
+c = meson.get_compiler('c')
+if c.get_argument_syntax() != objc.get_argument_syntax()
+  error('MESON_SKIP_TEST: cmake cannot mix compiler types on Windows')
+endif
+
 cm = import('cmake')
 
 sub_pro = cm.subproject('cmTest')

diff --git a/test cases/cmake/24 mixing languages/subprojects/cmTest/CMakeLists.txt b/test cases/cmake/24 mixing languages/subprojects/cmTest/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.5)
 
-project(cmTest)
+project(cmTest LANGUAGES C OBJC)
 
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 

diff --git a/test cases/failing build/11 objc werror/meson.build b/test cases/failing build/11 objc werror/meson.build
@@ -2,4 +2,7 @@ project('test', default_options: ['werror=true'])
 if not add_languages('objc', required: false)
   error('MESON_SKIP_TEST: Objective C not found')
 endif
+if get_option('backend').startswith('vs')
+  error('MESON_SKIP_TEST: objcpp is not supported by vs backend')
+endif
 executable('prog', 'test.m')
diff --git a/test cases/failing build/12 objcpp werror/meson.build b/test cases/failing build/12 objcpp werror/meson.build
@@ -2,4 +2,7 @@ project('test', default_options: ['werror=true'])
 if not add_languages('objcpp', required: false)
   error('MESON_SKIP_TEST: Objective C++ not found')
 endif
+if get_option('backend').startswith('vs')
+  error('MESON_SKIP_TEST: objcpp is not supported by vs backend')
+endif
 executable('prog', 'test.mm')
diff --git a/test cases/objc/1 simple/meson.build b/test cases/objc/1 simple/meson.build
@@ -1,4 +1,8 @@
 project('objective c', 'objc', default_options: ['c_std=c99'])
 
+if get_option('backend').startswith('vs')
+  error('MESON_SKIP_TEST: objc is not supported by vs backend')
+endif
+
 exe = executable('prog', 'prog.m')
 test('objctest', exe)
diff --git a/test cases/objc/2 nsstring/meson.build b/test cases/objc/2 nsstring/meson.build
@@ -1,5 +1,9 @@
 project('nsstring', 'objc')
 
+if get_option('backend').startswith('vs')
+  error('MESON_SKIP_TEST: objc is not supported by vs backend')
+endif
+
 if host_machine.system() == 'darwin'
   dep = dependency('appleframeworks', modules : 'Foundation')
 elif host_machine.system() == 'cygwin'

diff --git a/test cases/objc/3 objc args/meson.build b/test cases/objc/3 objc args/meson.build
@@ -1,4 +1,8 @@
 project('objective c args', 'objc')
 
+if get_option('backend').startswith('vs')
+  error('MESON_SKIP_TEST: objc is not supported by vs backend')
+endif
+
 exe = executable('prog', 'prog.m', objc_args : ['-DMESON_TEST'])
 test('objective c args', exe)
diff --git a/test cases/objc/4 c++ project objc subproject/meson.build b/test cases/objc/4 c++ project objc subproject/meson.build
@@ -1,5 +1,9 @@
 project('master', ['cpp'])
 
+if get_option('backend').startswith('vs')
+  error('MESON_SKIP_TEST: objc is not supported by vs backend')
+endif
+
 foo = subproject('foo')
 dep = foo.get_variable('foo_dep')
 

diff --git a/test cases/objc/4 c++ project objc subproject/subprojects/foo/meson.build b/test cases/objc/4 c++ project objc subproject/subprojects/foo/meson.build
@@ -1,5 +1,9 @@
 project('foo', ['objc'])
 
+if get_option('backend').startswith('vs')
+  error('MESON_SKIP_TEST: objc is not supported by vs backend')
+endif
+
 l = static_library('foo', 'foo.m')
 
 foo_dep = declare_dependency(link_with : l)
diff --git a/test cases/objc/5 objfw/meson.build b/test cases/objc/5 objfw/meson.build
@@ -1,5 +1,9 @@
 project('objfw build tests', 'objc')
 
+if get_option('backend').startswith('vs')
+  error('MESON_SKIP_TEST: objc is not supported by vs backend')
+endif
+
 objfw_dep = dependency('objfw', required: false)
 objfwtest_dep = dependency('objfw', modules: ['ObjFWTest'], required: false)
 

diff --git a/test cases/objcpp/1 simple/meson.build b/test cases/objcpp/1 simple/meson.build
@@ -1,4 +1,8 @@
 project('Objective C++', 'objcpp', default_options: 'cpp_std=c++14')
 
+if get_option('backend').startswith('vs')
+  error('MESON_SKIP_TEST: objcpp is not supported by vs backend')
+endif
+
 exe = executable('objcppprog', 'prog.mm')
 test('objcpp', exe)
diff --git a/test cases/objcpp/2 objc++ args/meson.build b/test cases/objcpp/2 objc++ args/meson.build
@@ -1,4 +1,8 @@
 project('objective c++ args', 'objcpp')
 
+if get_option('backend').startswith('vs')
+  error('MESON_SKIP_TEST: objcpp is not supported by vs backend')
+endif
+
 exe = executable('prog', 'prog.mm', objcpp_args : ['-DMESON_OBJCPP_TEST'])
 test('objective c++ args', exe)
diff --git a/test cases/objcpp/3 objfw/meson.build b/test cases/objcpp/3 objfw/meson.build
@@ -1,5 +1,9 @@
 project('objfw build tests', 'objcpp')
 
+if get_option('backend').startswith('vs')
+  error('MESON_SKIP_TEST: objcpp is not supported by vs backend')
+endif
+
 objfw_dep = dependency('objfw', required: false)
 objfwtest_dep = dependency('objfw', modules: ['ObjFWTest'], required: false)