Merge branch 'features/newarch' into develop

Conflicts: lib/spack/spack/config.py var/spack/repos/builtin/packages/lua/package.py
2016-06-16 03:03:26 -07:00
parent c803f7ae98 17b868381f
commit 88b73bacdb
68 changed files with 2350 additions and 516 deletions
--- a/var/spack/repos/builtin/packages/lua/package.py
+++ b/var/spack/repos/builtin/packages/lua/package.py
@@ -57,7 +57,7 @@ class Lua(Package):
        placement='luarocks')

    def install(self, spec, prefix):
-        if spec.satisfies("arch=darwin-i686") or spec.satisfies("arch=darwin-x86_64"):  # NOQA: ignore=E501
+        if spec.satisfies("platform=darwin"):
            target = 'macosx'
        else:
            target = 'linux'