From 0373d6a37fb55f0ab890728192342e296d617fda Mon Sep 17 00:00:00 2001 From: pforai Date: Fri, 15 May 2015 23:27:17 +0300 Subject: [PATCH 1/2] expose $CRAYPE_LINK_TYPE=dynamic in case of either shared or dynamic toolchain option is set. --- easybuild/toolchains/compiler/craype.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/easybuild/toolchains/compiler/craype.py b/easybuild/toolchains/compiler/craype.py index 443a4f42d4..b93494b9d5 100644 --- a/easybuild/toolchains/compiler/craype.py +++ b/easybuild/toolchains/compiler/craype.py @@ -68,8 +68,9 @@ class CrayPECompiler(Compiler): } COMPILER_UNIQUE_OPTION_MAP = { - 'shared': 'shared', - 'dynamic': 'dynamic', + #handled shared and dynamic always via CRAYPE_LINK_TYPE environment variable, dont pass flags to wrapper. + 'shared': '', + 'dynamic': '', 'static': 'static', 'verbose': 'craype-verbose', 'mpich-mt': 'craympich-mt', @@ -117,7 +118,7 @@ def prepare(self, *args, **kwargs): """Prepare to use this toolchain; define $CRAYPE_LINK_TYPE if 'dynamic' toolchain option is enabled.""" super(CrayPECompiler, self).prepare(*args, **kwargs) - if self.options['dynamic']: + if self.options['dynamic'] or self.options['shared']: env.setvar('CRAYPE_LINK_TYPE', 'dynamic') From fbe5ada451f5e3c67c8e7de1593a7605c1e0f62a Mon Sep 17 00:00:00 2001 From: pforai Date: Fri, 15 May 2015 23:44:29 +0300 Subject: [PATCH 2/2] Dropped tabs. Sry. --- easybuild/toolchains/compiler/craype.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/easybuild/toolchains/compiler/craype.py b/easybuild/toolchains/compiler/craype.py index b93494b9d5..da730a3f42 100644 --- a/easybuild/toolchains/compiler/craype.py +++ b/easybuild/toolchains/compiler/craype.py @@ -68,7 +68,7 @@ class CrayPECompiler(Compiler): } COMPILER_UNIQUE_OPTION_MAP = { - #handled shared and dynamic always via CRAYPE_LINK_TYPE environment variable, dont pass flags to wrapper. + #handled shared and dynamic always via CRAYPE_LINK_TYPE environment variable, dont pass flags to wrapper. 'shared': '', 'dynamic': '', 'static': 'static',