CompilerArgs: Put start/end-group around shared libs too

Closes https://github.com/mesonbuild/meson/issues/2096

7 files changed, 60 insertions, 1 deletions

diff --git a/test cases/common/153 recursive linking/edge-cases/libsto.c b/test cases/common/153 recursive linking/edge-cases/libsto.c
new file mode 100644
index 000000000..93f46a88c
--- /dev/null
+++ b/test cases/common/153 recursive linking/edge-cases/libsto.c
@@ -0,0 +1,8 @@
+#include "../lib.h"
+
+int get_builto_value (void);
+
+SYMBOL_EXPORT
+int get_stodep_value (void) {
+  return get_builto_value ();
+}
diff --git a/test cases/common/153 recursive linking/edge-cases/meson.build b/test cases/common/153 recursive linking/edge-cases/meson.build
new file mode 100644
index 000000000..6a46266b4
--- /dev/null
+++ b/test cases/common/153 recursive linking/edge-cases/meson.build
@@ -0,0 +1,9 @@
+# Test https://github.com/mesonbuild/meson/issues/2096
+# Note that removing 'shnodep' from link_with: makes the error go away because
+# then it is added after the static library is added to the link command.
+test('shared-static', executable('shstexe', 'shstmain.c', link_with : [shnodep, stshdep]))
+
+# Static library that needs a symbol defined in an object file. This already
+# works, but good to add a test case early.
+stodep = static_library('stodep', 'libsto.c')
+test('stodep', executable('stodep', 'stomain.c', 'stobuilt.c', link_with : stodep))
diff --git a/test cases/common/153 recursive linking/edge-cases/shstmain.c b/test cases/common/153 recursive linking/edge-cases/shstmain.c
new file mode 100644
index 000000000..b44c55f6c
--- /dev/null
+++ b/test cases/common/153 recursive linking/edge-cases/shstmain.c
@@ -0,0 +1,16 @@
+#include <stdio.h>
+
+#include "../lib.h"
+
+int get_stshdep_value (void);
+
+int main(int argc, char *argv[]) {
+  int val;
+
+  val = get_stshdep_value ();
+  if (val != 1) {
+    printf("st1 value was %i instead of 1\n", val);
+    return -1;
+  }
+  return 0;
+}
diff --git a/test cases/common/153 recursive linking/edge-cases/stobuilt.c b/test cases/common/153 recursive linking/edge-cases/stobuilt.c
new file mode 100644
index 000000000..9cc15bcae
--- /dev/null
+++ b/test cases/common/153 recursive linking/edge-cases/stobuilt.c
@@ -0,0 +1,7 @@
+#include "../lib.h"
+
+
+SYMBOL_EXPORT
+int get_builto_value (void) {
+  return 1;
+}
diff --git a/test cases/common/153 recursive linking/edge-cases/stomain.c b/test cases/common/153 recursive linking/edge-cases/stomain.c
new file mode 100644
index 000000000..90208a77a
--- /dev/null
+++ b/test cases/common/153 recursive linking/edge-cases/stomain.c
@@ -0,0 +1,16 @@
+#include <stdio.h>
+
+#include "../lib.h"
+
+int get_stodep_value (void);
+
+int main(int argc, char *argv[]) {
+  int val;
+
+  val = get_stodep_value ();
+  if (val != 1) {
+    printf("st1 value was %i instead of 1\n", val);
+    return -1;
+  }
+  return 0;
+}
diff --git a/test cases/common/153 recursive linking/meson.build b/test cases/common/153 recursive linking/meson.build
index 4cecd5727..2ca715157 100644
--- a/test cases/common/153 recursive linking/meson.build
+++ b/test cases/common/153 recursive linking/meson.build
@@ -24,3 +24,6 @@ subdir('3rdorderdeps')
 # Circular dependencies between static libraries
 # This requires the use of --start/end-group with GNU ld
 subdir('circular')
+
+# Various edge cases that have been reported
+subdir('edge-cases')
diff --git a/test cases/common/153 recursive linking/shnodep/meson.build b/test cases/common/153 recursive linking/shnodep/meson.build
index 796f0ddcb..66cfd9bc6 100644
--- a/test cases/common/153 recursive linking/shnodep/meson.build
+++ b/test cases/common/153 recursive linking/shnodep/meson.build
@@ -1 +1 @@
-shnodep = shared_library('shnodep', 'lib.c')
+shnodep = shared_library('shnodep', 'lib.c', version: '0.0.0')