cc: clean up cray compilers, fix issues with case-insensitive filesystems (#10323)
* 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:
		
				
					committed by
					
						
						Todd Gamblin
					
				
			
			
				
	
			
			
			
						parent
						
							07d9d444ea
						
					
				
				
					commit
					dc6dca3c36
				
			
							
								
								
									
										1
									
								
								lib/spack/env/cce/case-insensitive/CC
									
									
									
									
										vendored
									
									
										Symbolic link
									
								
							
							
						
						
									
										1
									
								
								lib/spack/env/cce/case-insensitive/CC
									
									
									
									
										vendored
									
									
										Symbolic link
									
								
							@@ -0,0 +1 @@
 | 
			
		||||
../../cc
 | 
			
		||||
							
								
								
									
										1
									
								
								lib/spack/env/cray/CC
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										1
									
								
								lib/spack/env/cray/CC
									
									
									
									
										vendored
									
									
								
							@@ -1 +0,0 @@
 | 
			
		||||
../cc
 | 
			
		||||
							
								
								
									
										1
									
								
								lib/spack/env/craype/CC
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										1
									
								
								lib/spack/env/craype/CC
									
									
									
									
										vendored
									
									
								
							@@ -1 +0,0 @@
 | 
			
		||||
../cc
 | 
			
		||||
							
								
								
									
										1
									
								
								lib/spack/env/craype/cc
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										1
									
								
								lib/spack/env/craype/cc
									
									
									
									
										vendored
									
									
								
							@@ -1 +0,0 @@
 | 
			
		||||
../cc
 | 
			
		||||
							
								
								
									
										1
									
								
								lib/spack/env/craype/ftn
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										1
									
								
								lib/spack/env/craype/ftn
									
									
									
									
										vendored
									
									
								
							@@ -1 +0,0 @@
 | 
			
		||||
../cc
 | 
			
		||||
@@ -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)
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -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):
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user