diff options
Diffstat (limited to 'var')
-rw-r--r-- | var/spack/repos/builtin.mock/packages/cmake-client/package.py | 2 | ||||
-rw-r--r-- | var/spack/repos/builtin/packages/oommf/package.py | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/var/spack/repos/builtin.mock/packages/cmake-client/package.py b/var/spack/repos/builtin.mock/packages/cmake-client/package.py index 2ce5a98dd1..a0694f2d6d 100644 --- a/var/spack/repos/builtin.mock/packages/cmake-client/package.py +++ b/var/spack/repos/builtin.mock/packages/cmake-client/package.py @@ -109,7 +109,7 @@ class CmakeClient(CMakePackage): print(cmake) print(cmake.exe) check( - cmake.exe[0].startswith(spec["cmake"].prefix.bin), + cmake.path.startswith(spec["cmake"].prefix.bin), "Wrong cmake was in environment: %s" % cmake, ) diff --git a/var/spack/repos/builtin/packages/oommf/package.py b/var/spack/repos/builtin/packages/oommf/package.py index f7127f073e..a3a4a6aeac 100644 --- a/var/spack/repos/builtin/packages/oommf/package.py +++ b/var/spack/repos/builtin/packages/oommf/package.py @@ -168,15 +168,15 @@ class Oommf(Package): def configure(self, spec, prefix): # change into directory with source code with working_dir(self.get_oommf_source_root()): - configure = Executable("./oommf.tcl pimake distclean") - configure() - configure2 = Executable("./oommf.tcl pimake upgrade") - configure2() + configure = Executable("./oommf.tcl") + configure("pimake", "distclean") + configure2 = Executable("./oommf.tcl") + configure2("pimake", "upgrade") def build(self, spec, prefix): with working_dir(self.get_oommf_source_root()): - make = Executable("./oommf.tcl pimake ") - make() + make = Executable("./oommf.tcl") + make("pimake") def install(self, spec, prefix): # keep a copy of all the tcl files and everything oommf created. |