Chiebot-Mirror
/
meson
mirror of https://github.com/mesonbuild/meson.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Clarified version of lcc which will not suffer from depfiles problem

Browse Source
pull/3115/head
makise-homura 7 years ago
parent 495f47b12b
commit dfac0ce8d7
3 changed files with 6 additions and 6 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      test cases/common/132 dependency file generation/meson.build
  2. 4
      test cases/common/22 header in file list/meson.build
  3. 4
      test cases/common/64 custom header generator/meson.build

4
test cases/common/132 dependency file generation/meson.build
Unescape View File

@ -3,8 +3,8 @@ project('dep file gen', 'c')
cc_id = meson.get_compiler('c').get_id() cc_id = meson.get_compiler('c').get_id()
cc_ver = meson.get_compiler('c').version() cc_ver = meson.get_compiler('c').version()
if cc_id == 'intel' or (cc_id == 'lcc' and cc_ver.version_compare('<=1.21.22') if cc_id == 'intel' or (cc_id == 'lcc' and cc_ver.version_compare('<=1.23.08')
# ICC and LCC <= 1.21.22 do not escape spaces in paths in the dependency file, so Ninja # 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: # (correctly) thinks that the rule has multiple outputs and errors out:
# 'depfile has multiple output paths' # 'depfile has multiple output paths'
error('MESON_SKIP_TEST: Skipping test because your compiler is known to generate broken dependency files') error('MESON_SKIP_TEST: Skipping test because your compiler is known to generate broken dependency files')

4
test cases/common/22 header in file list/meson.build
Unescape View File

@ -3,8 +3,8 @@ project('header in file list', 'c')
cc_id = meson.get_compiler('c').get_id() cc_id = meson.get_compiler('c').get_id()
cc_ver = meson.get_compiler('c').version() cc_ver = meson.get_compiler('c').version()
if cc_id == 'intel' or (cc_id == 'lcc' and cc_ver.version_compare('<=1.21.22') if cc_id == 'intel' or (cc_id == 'lcc' and cc_ver.version_compare('<=1.23.08')
# ICC and LCC <= 1.21.22 do not escape spaces in paths in the dependency file, so Ninja # 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: # (correctly) thinks that the rule has multiple outputs and errors out:
# 'depfile has multiple output paths' # 'depfile has multiple output paths'
error('MESON_SKIP_TEST: Skipping test because your compiler is known to generate broken dependency files') error('MESON_SKIP_TEST: Skipping test because your compiler is known to generate broken dependency files')

4
test cases/common/64 custom header generator/meson.build
Unescape View File

@ -3,8 +3,8 @@ project('custom header generator', 'c')
cc_id = meson.get_compiler('c').get_id() cc_id = meson.get_compiler('c').get_id()
cc_ver = meson.get_compiler('c').version() cc_ver = meson.get_compiler('c').version()
if cc_id == 'intel' or (cc_id == 'lcc' and cc_ver.version_compare('<=1.21.22') if cc_id == 'intel' or (cc_id == 'lcc' and cc_ver.version_compare('<=1.23.08')
# ICC and LCC <= 1.21.22 do not escape spaces in paths in the dependency file, so Ninja # 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: # (correctly) thinks that the rule has multiple outputs and errors out:
# 'depfile has multiple output paths' # 'depfile has multiple output paths'
error('MESON_SKIP_TEST: Skipping test because your compiler is known to generate broken dependency files') error('MESON_SKIP_TEST: Skipping test because your compiler is known to generate broken dependency files')

Write Preview
Loading…
Cancel
Save