diff options
author | Xavier Claessens <xavier.claessens@collabora.com> | 2021-03-20 10:38:01 -0400 |
---|---|---|
committer | Xavier Claessens <xclaesse@gmail.com> | 2021-03-22 14:45:10 -0400 |
commit | 20a90cf709a399e639e6f092ab0bb06c087084dc (patch) | |
tree | 8e1c32060189494dcef135e2d0f268897585b225 /mesonbuild/msetup.py | |
parent | 9dc7abe697af9e53fcd9783f6b2f5b2e223ba3c6 (diff) | |
download | meson-20a90cf709a399e639e6f092ab0bb06c087084dc.zip meson-20a90cf709a399e639e6f092ab0bb06c087084dc.tar.gz meson-20a90cf709a399e639e6f092ab0bb06c087084dc.tar.bz2 |
cmd_line_file.txt: Use cross/native file path resolved by coredata
This fix issue when using --wipe and the machine file was passed as a
pipe and written locally, or when the file was resolved in XDG_DATA_HOME
or XDG_DATA_DIRS.
Fixes: #8560
Diffstat (limited to 'mesonbuild/msetup.py')
-rw-r--r-- | mesonbuild/msetup.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/mesonbuild/msetup.py b/mesonbuild/msetup.py index 139b476..5c7bb17 100644 --- a/mesonbuild/msetup.py +++ b/mesonbuild/msetup.py @@ -246,6 +246,10 @@ class MesonApp: b.devenv.append(intr.backend.get_devenv()) build.save(b, dumpfile) if env.first_invocation: + # Use path resolved by coredata because they could have been + # read from a pipe and wrote into a private file. + self.options.cross_file = env.coredata.cross_files + self.options.native_file = env.coredata.config_files coredata.write_cmd_line_file(self.build_dir, self.options) else: coredata.update_cmd_line_file(self.build_dir, self.options) |