Skip to content
Snippets Groups Projects
Commit f1ad0f76 authored by Eleni Mathioulaki's avatar Eleni Mathioulaki
Browse files

Merge branch 'fix-nest3.6-for-ebrains' into 'master'

Find real compiler path during compile time

Closes #51

See merge request technical-coordination/project-internal/devops/platform/ebrains-spack-builds!447
parents 7682e102 f11bb588
No related branches found
No related tags found
No related merge requests found
diff --git a/bin/nest-config.in b/bin/nest-config.in
index a54ae0352..43bff5286 100755
--- a/bin/nest-config.in
+++ b/bin/nest-config.in
@@ -71,7 +71,7 @@
echo "-L$prefix/@CMAKE_INSTALL_LIBDIR@/nest @MODULE_LINK_LIBS@"
;;
--compiler)
- echo "@CMAKE_CXX_COMPILER@"
+ echo "@SPACK_CXX_COMPILER@"
;;
--compiler-name)
echo "@CMAKE_CXX_COMPILER_ID@"
......@@ -29,6 +29,7 @@ class Nest(CMakePackage):
version('master', branch='master')
version('3.6', sha256='68d6b11791e1284dc94fef35d84c08dd7a11322c0f1e1fc9b39c5e6882284922')
patch('nest-simulator-3.6-p1-CxxRealPath.patch', when='@3.6')
version('3.5', sha256='3cdf5720854a4d8a7d359f9de9d2fb3619a0be2e36932028d6940360741547bd')
version('3.4', sha256='c56699111f899045ba48e55e87d14eca8763b48ebbb3648beee701a36aa3af20')
version('3.3', sha256='179462b966cc61f5785d2fee770bc36f86745598ace9cd97dd620622b62043ed')
......@@ -159,7 +160,10 @@ class Nest(CMakePackage):
make("install")
def cmake_args(self):
args = ["-DCMAKE_INSTALL_LIBDIR=lib"]
args = [
"-DCMAKE_INSTALL_LIBDIR=lib",
"-DSPACK_CXX_COMPILER=" + self.compiler.cxx
]
for flag in "boost mpi openmp optimize".split():
if '+' + flag in self.spec:
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment