diff --git a/lib/spack/env/cce/case-insensitive/CC b/lib/spack/env/cce/case-insensitive/CC
new file mode 120000
index 0000000000000000000000000000000000000000..e2deb67f3b62163df8abb26551f82fb3f99c6858
--- /dev/null
+++ b/lib/spack/env/cce/case-insensitive/CC
@@ -0,0 +1 @@
+../../cc
\ No newline at end of file
diff --git a/lib/spack/env/cray/cc b/lib/spack/env/cce/cc
similarity index 100%
rename from lib/spack/env/cray/cc
rename to lib/spack/env/cce/cc
diff --git a/lib/spack/env/cray/ftn b/lib/spack/env/cce/ftn
similarity index 100%
rename from lib/spack/env/cray/ftn
rename to lib/spack/env/cce/ftn
diff --git a/lib/spack/env/cray/CC b/lib/spack/env/cray/CC
deleted file mode 120000
index 82c2b8e90a381ef733daa21645dc316ee5efe94d..0000000000000000000000000000000000000000
--- a/lib/spack/env/cray/CC
+++ /dev/null
@@ -1 +0,0 @@
-../cc
\ No newline at end of file
diff --git a/lib/spack/env/craype/CC b/lib/spack/env/craype/CC
deleted file mode 120000
index 82c2b8e90a381ef733daa21645dc316ee5efe94d..0000000000000000000000000000000000000000
--- a/lib/spack/env/craype/CC
+++ /dev/null
@@ -1 +0,0 @@
-../cc
\ No newline at end of file
diff --git a/lib/spack/env/craype/cc b/lib/spack/env/craype/cc
deleted file mode 120000
index 82c2b8e90a381ef733daa21645dc316ee5efe94d..0000000000000000000000000000000000000000
--- a/lib/spack/env/craype/cc
+++ /dev/null
@@ -1 +0,0 @@
-../cc
\ No newline at end of file
diff --git a/lib/spack/env/craype/ftn b/lib/spack/env/craype/ftn
deleted file mode 120000
index 82c2b8e90a381ef733daa21645dc316ee5efe94d..0000000000000000000000000000000000000000
--- a/lib/spack/env/craype/ftn
+++ /dev/null
@@ -1 +0,0 @@
-../cc
\ No newline at end of file
diff --git a/lib/spack/spack/build_environment.py b/lib/spack/spack/build_environment.py
index d3ef9769172db3999f4d3667cb9bf6416ddd0fd0..103de3d6ceff8ac7923333da0124495e552cb37c 100644
--- a/lib/spack/spack/build_environment.py
+++ b/lib/spack/spack/build_environment.py
@@ -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)
 
diff --git a/lib/spack/spack/compilers/cce.py b/lib/spack/spack/compilers/cce.py
index 3d02122032e8ae8f8ad56521210d575865f1daba..eb1c6ab7dce6c68003ee91febcaafdb5eb5e7780 100644
--- a/lib/spack/spack/compilers/cce.py
+++ b/lib/spack/spack/compilers/cce.py
@@ -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):