From f4fb9a07718068fb96e22a43be6066daada92d10 Mon Sep 17 00:00:00 2001
From: Gregory Becker <becker33.llnl.gov>
Date: Wed, 20 Jul 2016 11:35:13 -0700
Subject: Set default link type to dynamic on cray. Includes hooks for
 platform-based environment changes

---
 lib/spack/spack/architecture.py      | 6 ++++++
 lib/spack/spack/build_environment.py | 6 ++++++
 lib/spack/spack/platforms/cray_xc.py | 7 +++++++
 3 files changed, 19 insertions(+)

diff --git a/lib/spack/spack/architecture.py b/lib/spack/spack/architecture.py
index a7cda2bf68..2701fa9a0c 100644
--- a/lib/spack/spack/architecture.py
+++ b/lib/spack/spack/architecture.py
@@ -190,6 +190,12 @@ class Platform(object):
 
         return self.operating_sys.get(name, None)
 
+    @classmethod
+    def setup_platform_environment(self, env):
+        """ Subclass can override this method if it requires any
+            platform-specific build environment modifications.
+        """
+        pass
 
     @classmethod
     def detect(self):
diff --git a/lib/spack/spack/build_environment.py b/lib/spack/spack/build_environment.py
index 93fb0690f7..4e799eeea1 100644
--- a/lib/spack/spack/build_environment.py
+++ b/lib/spack/spack/build_environment.py
@@ -248,6 +248,11 @@ def set_build_environment_variables(pkg, env, dirty=False):
         ci = join_path(item, 'case-insensitive')
         if os.path.isdir(ci):
             env_paths.append(ci)
+    
+#    for item in pkg.spec.platform.env_paths:
+#        env_paths.append(item)
+        # TODO: move platform-specific knowledge to platform.
+        # (join_path(spack.build_env_path, 'cray'))
 
     for item in reversed(env_paths):
         env.prepend_path('PATH', item)
@@ -444,6 +449,7 @@ def setup_package(pkg, dirty=False):
 
     set_compiler_environment_variables(pkg, spack_env)
     set_build_environment_variables(pkg, spack_env, dirty)
+    pkg.spec.architecture.platform.setup_platform_environment(spack_env)
     load_external_modules(pkg)
     # traverse in postorder so package can use vars from its dependencies
     spec = pkg.spec
diff --git a/lib/spack/spack/platforms/cray_xc.py b/lib/spack/spack/platforms/cray_xc.py
index e3c7761a94..aee375ac89 100644
--- a/lib/spack/spack/platforms/cray_xc.py
+++ b/lib/spack/spack/platforms/cray_xc.py
@@ -44,6 +44,13 @@ class CrayXc(Platform):
         self.add_operating_system(str(linux_dist), linux_dist)
         self.add_operating_system('CNL10', Cnl())
 
+    @classmethod
+    def setup_platform_environment(self, env):
+        """ Change the linker to default dynamic to be more
+            similar to linux/standard linker behavior
+        """
+        env.set('CRAYPE_LINK_TYPE', 'dynamic')
+
     @classmethod
     def detect(self):
         try:
-- 
cgit v1.2.3-70-g09d2