You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
26 lines
870 B
26 lines
870 B
2 months ago
|
From d77bb7131a5c6946e78e8055e79ab7837189529c Mon Sep 17 00:00:00 2001
|
||
|
|
From: Yu Watanabe <watanabe.yu+github@gmail.com>
|
||
|
|
Date: Fri, 3 Mar 2023 14:48:56 +0900
|
||
|
|
Subject: [PATCH] tools: fix the file name that "meson setup" generates
|
||
|
|
|
||
|
|
(cherry picked from commit 26ab5ea69d7b7804d0e9a7f4773443902c76c654)
|
||
|
|
|
||
|
|
Related: RHEL-30372
|
||
|
|
---
|
||
|
|
tools/meson-build.sh | 2 +-
|
||
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/tools/meson-build.sh b/tools/meson-build.sh
|
||
|
|
index ecd558f8d9..c8370a7e6a 100755
|
||
|
|
--- a/tools/meson-build.sh
|
||
|
|
+++ b/tools/meson-build.sh
|
||
|
|
@@ -10,7 +10,7 @@ CC="$5"
|
||
|
|
CXX="$6"
|
||
|
|
|
||
|
|
# shellcheck disable=SC2086
|
||
|
|
-[ -f "$dst/ninja.build" ] || CC="$CC" CXX="$CXX" meson "$src" "$dst" $options
|
||
|
|
+[ -f "$dst/build.ninja" ] || CC="$CC" CXX="$CXX" meson "$src" "$dst" $options
|
||
|
|
|
||
|
|
# Locate ninja binary, on CentOS 7 it is called ninja-build, so
|
||
|
|
# use that name if available.
|