diff options
| author | Nirbheek Chauhan <nirbheek@centricular.com> | 2017-02-03 17:21:08 +0530 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek@centricular.com> | 2017-02-18 02:38:54 +0530 |
| commit | a14eba27a9d68fa128dbcb9d4f4fd4d4a4e70f09 (patch) | |
| tree | 487aa9bfcd4a96d41d819452ccd68d2d4af4d41c /test cases/common/3 static | |
| parent | 217eae4011fa7693f6538d4240009fca7722d756 (diff) | |
| download | meson-a14eba27a9d68fa128dbcb9d4f4fd4d4a4e70f09.tar.gz | |
ninja: Delete output static lib before calling `ar`
Otherwise if the list of sources changes on reconfigure after building,
the static library will contain both the old and new objects.
Closes https://github.com/mesonbuild/meson/issues/1355
Diffstat (limited to 'test cases/common/3 static')
| -rw-r--r-- | test cases/common/3 static/libfile2.c | 3 | ||||
| -rw-r--r-- | test cases/common/3 static/meson.build | 3 | ||||
| -rw-r--r-- | test cases/common/3 static/meson_options.txt | 1 |
3 files changed, 6 insertions, 1 deletions
diff --git a/test cases/common/3 static/libfile2.c b/test cases/common/3 static/libfile2.c new file mode 100644 index 000000000..86bbb2c35 --- /dev/null +++ b/test cases/common/3 static/libfile2.c @@ -0,0 +1,3 @@ +int libfunc2() { + return 4; +} diff --git a/test cases/common/3 static/meson.build b/test cases/common/3 static/meson.build index 3dee93b78..e53995649 100644 --- a/test cases/common/3 static/meson.build +++ b/test cases/common/3 static/meson.build @@ -1,3 +1,4 @@ project('static library test', 'c') -lib = static_library('mylib', 'libfile.c', + +lib = static_library('mylib', get_option('source'), link_args : '-THISMUSTNOBEUSED') # Static linker needs to ignore all link args. diff --git a/test cases/common/3 static/meson_options.txt b/test cases/common/3 static/meson_options.txt new file mode 100644 index 000000000..7261a1992 --- /dev/null +++ b/test cases/common/3 static/meson_options.txt @@ -0,0 +1 @@ +option('source', type : 'combo', choices : ['libfile.c', 'libfile2.c'], value : 'libfile.c') |