aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNirbheek Chauhan <nirbheek.chauhan@gmail.com>2016-08-01 23:49:03 +0530
committerJussi Pakkanen <jpakkane@gmail.com>2016-08-01 21:19:03 +0300
commit909a62ca1ab7432f93d92df0505cbe88379a8ac7 (patch)
tree1ad1583c07787a8c194075a6a68a77a94306caea
parent657f357fc6ac0d97d30c940f9919b0021902a608 (diff)
downloadmeson-909a62ca1ab7432f93d92df0505cbe88379a8ac7.zip
meson-909a62ca1ab7432f93d92df0505cbe88379a8ac7.tar.gz
meson-909a62ca1ab7432f93d92df0505cbe88379a8ac7.tar.bz2
test common/86: Move static library back (#662)
This reverts 15ab984d8e2cf396be385d7515f72561c3cbaaa2 Also see #459
-rw-r--r--test cases/common/86 same basename/meson.build7
-rw-r--r--test cases/common/86 same basename/sub/meson.build1
2 files changed, 3 insertions, 5 deletions
diff --git a/test cases/common/86 same basename/meson.build b/test cases/common/86 same basename/meson.build
index e320f95..3dc384e 100644
--- a/test cases/common/86 same basename/meson.build
+++ b/test cases/common/86 same basename/meson.build
@@ -5,10 +5,9 @@ project('same basename', 'c')
# then the .o files will clobber each other.
shlib = shared_library('name', 'lib.c', c_args : '-DSHAR')
-# On Windows a static lib is a foo.lib but a share library
-# is both a foo.dll and a foo.lib. Put static in subdir to avoid
-# name clashes.
-subdir('sub')
+# On Windows a static lib is now libfoo.a, so it does not conflict with foo.lib
+# from the shared library above
+stlib = static_library('name', 'lib.c', c_args : '-DSTAT')
exe1 = executable('name', 'exe1.c', link_with : stlib)
exe2 = executable('name2', 'exe2.c', link_with : shlib)
diff --git a/test cases/common/86 same basename/sub/meson.build b/test cases/common/86 same basename/sub/meson.build
deleted file mode 100644
index 07250a5..0000000
--- a/test cases/common/86 same basename/sub/meson.build
+++ /dev/null
@@ -1 +0,0 @@
-stlib = static_library('name', '../lib.c', c_args : '-DSTAT')