From 09b63ae3d101d2889a7bbf8e393068abdc93312b Mon Sep 17 00:00:00 2001 From: AMD Toolchain Support <73240730+amd-toolchain-support@users.noreply.github.com> Date: Thu, 29 Oct 2020 20:43:30 +0530 Subject: Adding AOCC support for M4 (#19572) * Adding AOCC support for M4 * combining 4 if-statements into a single if-statement with or conditions * keeping parentheses around the or expressions * fixing flake8 test failures Co-authored-by: mohan babu --- var/spack/repos/builtin/packages/m4/package.py | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/m4/package.py b/var/spack/repos/builtin/packages/m4/package.py index 992329682a..6695cdf862 100644 --- a/var/spack/repos/builtin/packages/m4/package.py +++ b/var/spack/repos/builtin/packages/m4/package.py @@ -52,13 +52,10 @@ class M4(AutotoolsPackage, GNUMirrorPackage): if spec.satisfies('%cce@9:'): args.append('LDFLAGS=-rtlib=compiler-rt') - if spec.satisfies('%clang') and not spec.satisfies('platform=darwin'): - args.append('LDFLAGS=-rtlib=compiler-rt') - - if spec.satisfies('%arm') and not spec.satisfies('platform=darwin'): - args.append('LDFLAGS=-rtlib=compiler-rt') - - if spec.satisfies('%fj') and not spec.satisfies('platform=darwin'): + if (spec.satisfies('%clang') or + spec.satisfies('%aocc') or + spec.satisfies('%arm') or + spec.satisfies('%fj')) and not spec.satisfies('platform=darwin'): args.append('LDFLAGS=-rtlib=compiler-rt') if spec.satisfies('%intel@:18.999'): -- cgit v1.2.3-60-g2f50