summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/spack/spack/build_systems/meson.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/spack/spack/build_systems/meson.py b/lib/spack/spack/build_systems/meson.py
index d059d50cc3..65e0e7ad4f 100644
--- a/lib/spack/spack/build_systems/meson.py
+++ b/lib/spack/spack/build_systems/meson.py
@@ -120,6 +120,7 @@ class MesonBuilder(BaseBuilder):
of package writers.
"""
# standard Meson arguments
+
std_meson_args = MesonBuilder.std_args(self.pkg)
std_meson_args += getattr(self, "meson_flag_args", [])
return std_meson_args
@@ -182,7 +183,10 @@ class MesonBuilder(BaseBuilder):
def meson(self, pkg, spec, prefix):
"""Run ``meson`` in the build directory"""
- options = [os.path.abspath(self.root_mesonlists_dir)]
+ options = []
+ if self.spec["meson"].satisfies("@0.64:"):
+ options.append("setup")
+ options.append(os.path.abspath(self.root_mesonlists_dir))
options += self.std_meson_args
options += self.meson_args()
with fs.working_dir(self.build_directory, create=True):