diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2018-10-04 20:52:08 -0400 |
|---|---|---|
| committer | John Ericson <git@JohnEricson.me> | 2019-06-09 13:13:25 -0400 |
| commit | 07777e15d47dbddaf849d24b3a30c85745c533ca (patch) | |
| tree | f472472ed511498c329b4e13e19b1585e1afb621 /test cases/unit | |
| parent | 32e827dcdc451e1c5dde952cf08e4b654eac7057 (diff) | |
| download | meson-07777e15d47dbddaf849d24b3a30c85745c533ca.tar.gz | |
Purge `is_cross` and friends without changing user interfaces
In most cases instead pass `for_machine`, the name of the relevant
machines (what compilers target, what targets run on, etc). This allows
us to use the cross code path in the native case, deduplicating the
code.
As one can see, environment got bigger as more information is kept
structured there, while ninjabackend got a smaller. Overall a few amount
of lines were added, but the hope is what's added is a lot simpler than
what's removed.
Diffstat (limited to 'test cases/unit')
| -rw-r--r-- | test cases/unit/55 pkg_config_path option/meson.build | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/test cases/unit/55 pkg_config_path option/meson.build b/test cases/unit/55 pkg_config_path option/meson.build index 3af6164f1..f9ceead06 100644 --- a/test cases/unit/55 pkg_config_path option/meson.build +++ b/test cases/unit/55 pkg_config_path option/meson.build @@ -3,10 +3,5 @@ project('pkg_config_path option') build = dependency('totally_made_up_dep', native: true, method : 'pkg-config') host = dependency('totally_made_up_dep', native: false, method : 'pkg-config') -# TODO always test we can do this separately -if meson.is_cross_build() - assert(build.version() == '4.5.6', 'wrong version for build machine dependency') -else - assert(host.version() == '1.2.3', 'wrong version for host machine dependency') -endif +assert(build.version() == '4.5.6', 'wrong version for build machine dependency') assert(host.version() == '1.2.3', 'wrong version for host machine dependency') |