diff options
| author | Denis Davydov <davydden@gmail.com> | 2016-03-23 17:38:36 +0100 |
|---|---|---|
| committer | Denis Davydov <davydden@gmail.com> | 2016-03-25 11:56:40 +0100 |
| commit | e51fe2934e0189aa5c33c8663819d23e7706f809 (patch) | |
| tree | 278b6919be34937c704b9946a4e2410aa41a5ae5 | |
| parent | fade526ae4e748a9454fd56c07ef7bc1fca38423 (diff) | |
| download | spack-e51fe2934e0189aa5c33c8663819d23e7706f809.tar.gz spack-e51fe2934e0189aa5c33c8663819d23e7706f809.tar.bz2 spack-e51fe2934e0189aa5c33c8663819d23e7706f809.tar.xz spack-e51fe2934e0189aa5c33c8663819d23e7706f809.zip | |
fiddle more
| -rw-r--r-- | var/spack/repos/builtin/packages/trilinos/package.py | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/var/spack/repos/builtin/packages/trilinos/package.py b/var/spack/repos/builtin/packages/trilinos/package.py index 12212360a0..fb14e1f36c 100644 --- a/var/spack/repos/builtin/packages/trilinos/package.py +++ b/var/spack/repos/builtin/packages/trilinos/package.py @@ -67,7 +67,6 @@ class Trilinos(Package): '-DTPL_ENABLE_Boost:BOOL=ON', '-DBoost_INCLUDE_DIRS:PATH=%s' % spec['boost'].prefix.include, '-DBoost_LIBRARY_DIRS:PATH=%s' % spec['boost'].prefix.lib, - # '-DTrilinos_ENABLE_Fortran=OFF', # FIXME '-DTrilinos_ENABLE_EXPLICIT_INSTANTIATION:BOOL=ON', '-DTrilinos_ENABLE_CXX11:BOOL=ON', '-DTrilinos_CXX11_FLAGS=-std=c++11', @@ -82,10 +81,9 @@ class Trilinos(Package): # Fortran lib libgfortran = os.path.dirname (os.popen('%s --print-file-name libgfortran.a' % join_path(mpi_bin,'mpif90') ).read()) - #os.environ['LDFLAGS'] = '-L%s -lgfortran' % libgfortran options.extend([ - '-DTrilinos_EXTRA_LINK_FLAGS:STRING=-lgfortran', - '-DCMAKE_EXE_LINKER_FLAGS:STRING=-L%s -lgfortran' % libgfortran + '-DTrilinos_EXTRA_LINK_FLAGS:STRING=-L%s/ -lgfortran' % libgfortran, + '-DTrilinos_ENABLE_Fortran=OFF' # FIXME: otherwise VerifyFortranC fails as it does not contain -lgfortran , issues with IMPLICIT_LINK_LIBRARIES in CMakeFiles/CMake(C|CXX|Fortran)Compiler.cmake? ]) # for build-debug only: @@ -155,11 +153,6 @@ class Trilinos(Package): '-DTrilinos_ENABLE_STK=OFF' ]) - #if self.compiler.name == "clang": - # options.extend([ - # '-DCMAKE_EXE_LINKER_FLAGS:STRING=-Qunused-arguments' - # ]) - with working_dir('spack-build', create=True): cmake('..', *options) make() |