summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNathan <35582439+yee29@users.noreply.github.com>2020-04-29 08:52:23 -0700
committerGitHub <noreply@github.com>2020-04-29 10:52:23 -0500
commitb6b44948b8624b6e23484a8cb59f8e325ef76e37 (patch)
treec1ed54b46b524e01c513e10e26be2ed0d82f4ceb
parent42d7fd30c46482fe3d8da1e65301bf5e7da2df6f (diff)
downloadspack-b6b44948b8624b6e23484a8cb59f8e325ef76e37.tar.gz
spack-b6b44948b8624b6e23484a8cb59f8e325ef76e37.tar.bz2
spack-b6b44948b8624b6e23484a8cb59f8e325ef76e37.tar.xz
spack-b6b44948b8624b6e23484a8cb59f8e325ef76e37.zip
prefix gets removed when adding additional configure options (#16335)
* prefix gets removed when adding additional configure options * Update waf documentation to reflect the new change
-rw-r--r--lib/spack/docs/build_systems/wafpackage.rst5
-rw-r--r--lib/spack/spack/build_systems/waf.py5
2 files changed, 6 insertions, 4 deletions
diff --git a/lib/spack/docs/build_systems/wafpackage.rst b/lib/spack/docs/build_systems/wafpackage.rst
index 1916630f4c..36fc21a772 100644
--- a/lib/spack/docs/build_systems/wafpackage.rst
+++ b/lib/spack/docs/build_systems/wafpackage.rst
@@ -47,8 +47,9 @@ Each phase provides a ``<phase>`` function that runs:
where ``<jobs>`` is the number of parallel jobs to build with. Each phase
also has a ``<phase_args>`` function that can pass arguments to this call.
-All of these functions are empty except for the ``configure_args``
-function, which passes ``--prefix=/path/to/installation/prefix``.
+All of these functions are empty. The ``configure`` phase
+automatically adds ``--prefix=/path/to/installation/prefix``, so you
+don't need to add that in the ``configure_args``.
^^^^^^^
Testing
diff --git a/lib/spack/spack/build_systems/waf.py b/lib/spack/spack/build_systems/waf.py
index 6bf9a432e0..a1581660f2 100644
--- a/lib/spack/spack/build_systems/waf.py
+++ b/lib/spack/spack/build_systems/waf.py
@@ -75,13 +75,14 @@ class WafPackage(PackageBase):
def configure(self, spec, prefix):
"""Configures the project."""
- args = self.configure_args()
+ args = ['--prefix={0}'.format(self.prefix)]
+ args += self.configure_args()
self.waf('configure', *args)
def configure_args(self):
"""Arguments to pass to configure."""
- return ['--prefix={0}'.format(self.prefix)]
+ return []
def build(self, spec, prefix):
"""Executes the build."""