aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEli Schwartz <eschwartz@archlinux.org>2022-10-31 23:16:16 -0400
committerEli Schwartz <eschwartz@archlinux.org>2022-10-31 23:22:07 -0400
commitf9d6ae8d57500b243ed34684b44486a37f3c67fa (patch)
tree42c7f37182ba6bd2e39177189f37cb7a0af5a6db
parent4533dfc279bc301b62dfee7c288aba5ecf0c036d (diff)
downloadmeson-f9d6ae8d57500b243ed34684b44486a37f3c67fa.zip
meson-f9d6ae8d57500b243ed34684b44486a37f3c67fa.tar.gz
meson-f9d6ae8d57500b243ed34684b44486a37f3c67fa.tar.bz2
Revert "tests: Test extern'd globals on MacOS with the Apple Archiver"
This reverts commit d285be763f193606b078f218fdedc58679dfe037. This is part of #10628 and needs to be reverted, as it breaks other things. See https://github.com/mesonbuild/meson/pull/10628#issuecomment-1230560772
-rw-r--r--test cases/osx/9 global variable ar/libfile.c9
-rw-r--r--test cases/osx/9 global variable ar/libfile2.c7
-rw-r--r--test cases/osx/9 global variable ar/meson.build6
-rw-r--r--test cases/osx/9 global variable ar/nativefile.ini2
-rw-r--r--test cases/osx/9 global variable ar/prog.c7
5 files changed, 0 insertions, 31 deletions
diff --git a/test cases/osx/9 global variable ar/libfile.c b/test cases/osx/9 global variable ar/libfile.c
deleted file mode 100644
index b258d7b..0000000
--- a/test cases/osx/9 global variable ar/libfile.c
+++ /dev/null
@@ -1,9 +0,0 @@
-// Source: https://lists.gnu.org/archive/html/libtool/2002-07/msg00025.html
-
-#include <stdio.h>
-
-extern int l2;
-void l1(void)
-{
- printf("l1 %d\n", l2);
-}
diff --git a/test cases/osx/9 global variable ar/libfile2.c b/test cases/osx/9 global variable ar/libfile2.c
deleted file mode 100644
index 1499c4d..0000000
--- a/test cases/osx/9 global variable ar/libfile2.c
+++ /dev/null
@@ -1,7 +0,0 @@
-// Source: https://lists.gnu.org/archive/html/libtool/2002-07/msg00025.html
-
-int l2;
-void l2_func(void)
-{
- l2 = 77;
-}
diff --git a/test cases/osx/9 global variable ar/meson.build b/test cases/osx/9 global variable ar/meson.build
deleted file mode 100644
index 313dd1b..0000000
--- a/test cases/osx/9 global variable ar/meson.build
+++ /dev/null
@@ -1,6 +0,0 @@
-# Source: https://lists.gnu.org/archive/html/libtool/2002-07/msg00025.html
-
-project('global variable test', 'c')
-
-lib = static_library('mylib', 'libfile.c', 'libfile2.c')
-test('global variable', executable('prog', 'prog.c', link_with: lib))
diff --git a/test cases/osx/9 global variable ar/nativefile.ini b/test cases/osx/9 global variable ar/nativefile.ini
deleted file mode 100644
index 4fb5e7f..0000000
--- a/test cases/osx/9 global variable ar/nativefile.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[binaries]
-ar = 'ar'
diff --git a/test cases/osx/9 global variable ar/prog.c b/test cases/osx/9 global variable ar/prog.c
deleted file mode 100644
index 4665016..0000000
--- a/test cases/osx/9 global variable ar/prog.c
+++ /dev/null
@@ -1,7 +0,0 @@
-// Source: https://lists.gnu.org/archive/html/libtool/2002-07/msg00025.html
-
-extern void l1(void);
-int main(void)
-{
- l1();
-}