From ae76834f3d491bc682b26734a20d733abb6e727d Mon Sep 17 00:00:00 2001 From: AMD Toolchain Support <73240730+amd-toolchain-support@users.noreply.github.com> Date: Mon, 11 Apr 2022 14:20:29 +0530 Subject: Python: fix build with AOCC compiler (#28708) Co-authored-by: Adam J. Stewart --- var/spack/repos/builtin/packages/python/package.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/python/package.py b/var/spack/repos/builtin/packages/python/package.py index 719e5dd56b..2281e9665c 100644 --- a/var/spack/repos/builtin/packages/python/package.py +++ b/var/spack/repos/builtin/packages/python/package.py @@ -270,9 +270,7 @@ class Python(Package): ) conflicts('+tix', when='~tkinter', msg='python+tix requires python+tix+tkinter') - conflicts('%nvhpc') - conflicts('@:2.7', when='platform=darwin target=aarch64:', msg='Python 2.7 is too old for Apple Silicon') @@ -455,6 +453,13 @@ class Python(Package): if name == 'cflags': flags.append('-fwrapv') + # Fix for following issues for python with aocc%3.2.0: + # https://github.com/spack/spack/issues/29115 + # https://github.com/spack/spack/pull/28708 + if self.spec.satisfies('%aocc@3.2.0', strict=True): + if name == 'cflags': + flags.extend(['-mllvm', '-disable-indvar-simplify=true']) + # allow flags to be passed through compiler wrapper return (flags, None, None) -- cgit v1.2.3-60-g2f50