Xcode: fix linking to customtargetindex objects.

3 files changed, 30 insertions, 12 deletions

diff --git a/test cases/common/209 link custom/meson.build b/test cases/common/209 link custom/meson.build
index 837e960..4d4f655 100644
--- a/test cases/common/209 link custom/meson.build
+++ b/test cases/common/209 link custom/meson.build
@@ -28,13 +28,17 @@ test('linkcustom2', exe2)
 
 # Link whole tests
 
-exe3 = executable('prog3', 'prog.c', link_whole: clib)
-test('linkwhole', exe)
+if meson.backend() == 'xcode'
+    message('Xcode does not support link whole so skipping.')
+else
+    exe3 = executable('prog3', 'prog.c', link_whole: clib)
+    test('linkwhole', exe)
 
-d2 = declare_dependency(link_whole: clib)
+    d2 = declare_dependency(link_whole: clib)
 
-exe4 = executable('prog4', 'prog.c', dependencies: d2)
-test('linkwhole2', exe2)
+    exe4 = executable('prog4', 'prog.c', dependencies: d2)
+    test('linkwhole2', exe2)
+endif
 
 # custom_target[i] tests
 
@@ -46,17 +50,21 @@ d_i = declare_dependency(link_with: clib[0])
 exe2_i = executable('prog2_i', 'prog.c', dependencies: d_i)
 test('linkcustom2_i', exe2_i)
 
-shared_library('lib1', 'lib.c', link_whole: clib)
-
 # Link whole tests
 
-exe3_i = executable('prog3_i', 'prog.c', link_whole: clib[0])
-test('linkwhole', exe)
+if meson.backend() == 'xcode'
+    message('Xcode does not support link whole so skipping.')
+else
+    shared_library('lib1', 'lib.c', link_whole: clib)
+
+    exe3_i = executable('prog3_i', 'prog.c', link_whole: clib[0])
+    test('linkwhole', exe)
 
-d2_i = declare_dependency(link_whole: clib[0])
+    d2_i = declare_dependency(link_whole: clib[0])
 
-exe4_i = executable('prog4_i', 'prog.c', dependencies: d2_i)
-test('linkwhole2_i', exe2_i)
+    exe4_i = executable('prog4_i', 'prog.c', dependencies: d2_i)
+    test('linkwhole2_i', exe2_i)
+endif
 
 # Link with custom target
 
diff --git a/test cases/common/210 link custom_i single from multiple/meson.build b/test cases/common/210 link custom_i single from multiple/meson.build
index eee1fe1..7aadb17 100644
--- a/test cases/common/210 link custom_i single from multiple/meson.build
+++ b/test cases/common/210 link custom_i single from multiple/meson.build
@@ -28,6 +28,11 @@ test('linkcustom2', exe2)
 
 # Link whole tests
 
+if meson.backend() == 'xcode'
+    message('Xcode does not support link whole so skipping.')
+    subdir_done()
+endif
+
 exe3 = executable('prog3', 'prog.c', link_whole: clib_2)
 test('linkwhole', exe)
 
diff --git a/test cases/common/211 link custom_i multiple from multiple/meson.build b/test cases/common/211 link custom_i multiple from multiple/meson.build
index e5236e5..ede059e 100644
--- a/test cases/common/211 link custom_i multiple from multiple/meson.build
+++ b/test cases/common/211 link custom_i multiple from multiple/meson.build
@@ -28,6 +28,11 @@ test('linkcustom2', exe2)
 
 # Link whole tests
 
+if meson.backend() == 'xcode'
+    message('Xcode does not support link whole so skipping.')
+    subdir_done()
+endif
+
 exe3 = executable('prog3', 'prog.c', link_whole: clibs)
 test('linkwhole', exe)