aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormakise-homura <akemi_homura@kurisa.ch>2018-04-12 22:48:04 +0300
committermakise-homura <akemi_homura@kurisa.ch>2018-04-12 22:48:04 +0300
commitdfac0ce8d7db2d445fab71410c37a4c3285ec45a (patch)
tree32c4fc35bee29d36b68b19ec03fe6a612de594af
parent495f47b12ba0f6463c999a1ec988146fd0b578b8 (diff)
downloadmeson-dfac0ce8d7db2d445fab71410c37a4c3285ec45a.zip
meson-dfac0ce8d7db2d445fab71410c37a4c3285ec45a.tar.gz
meson-dfac0ce8d7db2d445fab71410c37a4c3285ec45a.tar.bz2
Clarified version of lcc which will not suffer from depfiles problem
-rw-r--r--test cases/common/132 dependency file generation/meson.build4
-rw-r--r--test cases/common/22 header in file list/meson.build4
-rw-r--r--test cases/common/64 custom header generator/meson.build4
3 files changed, 6 insertions, 6 deletions
diff --git a/test cases/common/132 dependency file generation/meson.build b/test cases/common/132 dependency file generation/meson.build
index d5e1c07..cd66cb7 100644
--- a/test cases/common/132 dependency file generation/meson.build
+++ b/test cases/common/132 dependency file generation/meson.build
@@ -3,8 +3,8 @@ project('dep file gen', 'c')
cc_id = meson.get_compiler('c').get_id()
cc_ver = meson.get_compiler('c').version()
-if cc_id == 'intel' or (cc_id == 'lcc' and cc_ver.version_compare('<=1.21.22')
- # ICC and LCC <= 1.21.22 do not escape spaces in paths in the dependency file, so Ninja
+if cc_id == 'intel' or (cc_id == 'lcc' and cc_ver.version_compare('<=1.23.08')
+ # ICC and LCC <= 1.23.08 do not escape spaces in paths in the dependency file, so Ninja
# (correctly) thinks that the rule has multiple outputs and errors out:
# 'depfile has multiple output paths'
error('MESON_SKIP_TEST: Skipping test because your compiler is known to generate broken dependency files')
diff --git a/test cases/common/22 header in file list/meson.build b/test cases/common/22 header in file list/meson.build
index 5e478cf..ff42cc4 100644
--- a/test cases/common/22 header in file list/meson.build
+++ b/test cases/common/22 header in file list/meson.build
@@ -3,8 +3,8 @@ project('header in file list', 'c')
cc_id = meson.get_compiler('c').get_id()
cc_ver = meson.get_compiler('c').version()
-if cc_id == 'intel' or (cc_id == 'lcc' and cc_ver.version_compare('<=1.21.22')
- # ICC and LCC <= 1.21.22 do not escape spaces in paths in the dependency file, so Ninja
+if cc_id == 'intel' or (cc_id == 'lcc' and cc_ver.version_compare('<=1.23.08')
+ # ICC and LCC <= 1.23.08 do not escape spaces in paths in the dependency file, so Ninja
# (correctly) thinks that the rule has multiple outputs and errors out:
# 'depfile has multiple output paths'
error('MESON_SKIP_TEST: Skipping test because your compiler is known to generate broken dependency files')
diff --git a/test cases/common/64 custom header generator/meson.build b/test cases/common/64 custom header generator/meson.build
index a691dbb..1222525 100644
--- a/test cases/common/64 custom header generator/meson.build
+++ b/test cases/common/64 custom header generator/meson.build
@@ -3,8 +3,8 @@ project('custom header generator', 'c')
cc_id = meson.get_compiler('c').get_id()
cc_ver = meson.get_compiler('c').version()
-if cc_id == 'intel' or (cc_id == 'lcc' and cc_ver.version_compare('<=1.21.22')
- # ICC and LCC <= 1.21.22 do not escape spaces in paths in the dependency file, so Ninja
+if cc_id == 'intel' or (cc_id == 'lcc' and cc_ver.version_compare('<=1.23.08')
+ # ICC and LCC <= 1.23.08 do not escape spaces in paths in the dependency file, so Ninja
# (correctly) thinks that the rule has multiple outputs and errors out:
# 'depfile has multiple output paths'
error('MESON_SKIP_TEST: Skipping test because your compiler is known to generate broken dependency files')