From b2dad6ef108a487890dac8a54b87af40d3aabb97 Mon Sep 17 00:00:00 2001 From: Dario Berzano Date: Tue, 16 Oct 2018 18:06:33 +0200 Subject: [PATCH] Fix SHERPA dependency on GCC-Toolchain on macOS (#1334) --- sherpa.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sherpa.sh b/sherpa.sh index 97dc4ec8d4..100ca0de41 100644 --- a/sherpa.sh +++ b/sherpa.sh @@ -2,10 +2,11 @@ package: SHERPA version: "%(tag_basename)s" tag: "v2.2.4-alice1" source: https://github.com/alisw/SHERPA +requires: + - "GCC-Toolchain:(?!osx)" build_requires: - curl - autotools - - GCC-Toolchain - HepMC - lhapdf5 --- @@ -40,7 +41,7 @@ proc ModulesHelp { } { set version $PKGVERSION-@@PKGREVISION@$PKGHASH@@ module-whatis "ALICE Modulefile for $PKGNAME $PKGVERSION-@@PKGREVISION@$PKGHASH@@" # Dependencies -module load BASE/1.0 ${GCC_TOOLCHAIN_ROOT:+GCC-Toolchain/$GCC_TOOLCHAIN_VERSION-$GCC_TOOLCHAIN_REVISION} +module load BASE/1.0 ${GCC_TOOLCHAIN_VERSION:+GCC-Toolchain/$GCC_TOOLCHAIN_VERSION-$GCC_TOOLCHAIN_REVISION} # Our environment setenv SHERPA_ROOT \$::env(BASEDIR)/$PKGNAME/\$version setenv SHERPA_INSTALL_PATH \$::env(SHERPA_ROOT)/lib/SHERPA