zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cc: clean up cray compilers, fix issues with case-insensitive filesystems (#10323)

Browse Source 
* Remove Cray CC compilers causing problems on case-insensitive filesystems
* cray -> cce
* Ensure that compiler-specific directory comes first in build-env
* Point to compiler-specific symlinks
This commit is contained in:
Adam J. Stewart 2019-01-12 19:37:20 -06:00 committed by Todd Gamblin
parent 07d9d444ea
commit dc6dca3c36
9 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/spack/env/cce/case-insensitive/CC vendored Symbolic link
View File

@ -0,0 +1 @@
../../cc

0
lib/spack/env/cray/cc → lib/spack/env/cce/cc vendored
View File

0
lib/spack/env/cray/ftn → lib/spack/env/cce/ftn vendored
View File

1
lib/spack/env/cray/CC vendored
View File

@ -1 +0,0 @@
../cc

1
lib/spack/env/craype/CC vendored
View File

@ -1 +0,0 @@
../cc

1
lib/spack/env/craype/cc vendored
View File

@ -1 +0,0 @@
../cc

1
lib/spack/env/craype/ftn vendored
View File

@ -1 +0,0 @@
../cc

2
lib/spack/spack/build_environment.py
View File

@ -342,7 +342,7 @@ def set_build_environment_variables(pkg, env, dirty):
if os.path.isdir(ci):
env_paths.append(ci)
for item in reversed(env_paths):
for item in env_paths:
env.prepend_path('PATH', item)
env.set_path(SPACK_ENV_PATH, env_paths)

8
lib/spack/spack/compilers/cce.py
View File

@ -26,10 +26,10 @@ class Cce(Compiler):
PrgEnv = 'PrgEnv-cray'
PrgEnv_compiler = 'cce'
link_paths = {'cc': 'cc',
'cxx': 'c++',
'f77': 'f77',
'fc': 'fc'}
link_paths = {'cc': 'cce/cc',
'cxx': 'cce/case-insensitive/CC',
'f77': 'cce/ftn',
'fc': 'cce/ftn'}
@classmethod
def default_version(cls, comp):