Commit 2f723c97 authored by Bernd Buschinski's avatar Bernd Buschinski
Browse files

Fix meson executable

- on my system meson is a link to python2-exec
  $ ls -ld $(which meson)
  /usr/bin/meson -> ../lib/python-exec/python-exec2
  The python2-exec must not be executed directly.
- Currently the mesonExecutable is canonicalized, which also resolves symlinks
  This causes the meson plugin to execute stuff like:
  $ python2-exec --reconfigure
  instead of
  $ meson --reconfigure
  Fix this by not canonicalizing the mesonExecutable, validity is already checked earlier.

BUG: 412477
FIXED-IN: 5.8.220400
parent 2f2db958
Pipeline #105559 passed with stage
in 33 minutes and 59 seconds
......@@ -165,7 +165,7 @@ bool Meson::BuildDir::isValid() const
void Meson::BuildDir::canonicalizePaths()
{
for (auto* i : { &buildDir, &mesonExecutable }) {
for (auto* i : { &buildDir }) {
// canonicalFilePath checks if the file / directory exists and returns "" if it doesn't.
QString tmp = QFileInfo(i->toLocalFile()).canonicalFilePath();
if (!tmp.isEmpty()) {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment