From cb7e9c155ecc4df75df851a02a5c679e8a294999 Mon Sep 17 00:00:00 2001
From: "Daryl W. Grunau" <DarylGrunau@gmail.com>
Date: Mon, 5 Aug 2019 19:16:14 -0600
Subject: [PATCH] Packages/musl (#12288)
* bump eospac version
* Revert "bump eospac version"
This reverts commit 835b1f822d8c083f6ab9eb17222c00409e8eb3da.
* fix-up musl-gcc wrapper script
* address adamjstewart's comments
---
.../repos/builtin/packages/musl/package.py | 21 ++++++++++++++++++-
1 file changed, 20 insertions(+), 1 deletion(-)
diff --git a/var/spack/repos/builtin/packages/musl/package.py b/var/spack/repos/builtin/packages/musl/package.py
index 34a53c3871..4fb6d90170 100644
--- a/var/spack/repos/builtin/packages/musl/package.py
+++ b/var/spack/repos/builtin/packages/musl/package.py
@@ -33,8 +33,27 @@ class Musl(Package):
phases = ['configure', 'build', 'install']
+ def patch(self):
+ config = FileFilter('configure')
+ if self.compiler.name == 'gcc':
+ config.filter("WRAPCC_GCC = .*'", "WRAPCC_GCC = {0}'".
+ format(self.compiler.cc))
+ elif self.compiler.name == 'clang':
+ config.filter("WRAPCC_CLANG = .*'", "WRAPCC_CLANG = {0}'".
+ format(self.compiler.cc))
+
+ def configure_args(self):
+ args = ['--prefix={0}'.format(prefix)]
+ if self.compiler.name == 'gcc':
+ args.append('--enable-wrapper=gcc')
+ elif self.compiler.name == 'clang':
+ args.append('--enable-wrapper=clang')
+ else:
+ args.append('--enable-wrapper=no')
+ return args
+
def configure(self, spec, prefix):
- configure('--prefix={0}'.format(prefix))
+ configure(*self.configure_args())
def build(self, spec, prefix):
make()
--
GitLab