small changes on the deploy me / documentation scripts
This commit is contained in:
parent
368787d770
commit
142a72335e
|
@ -36,9 +36,9 @@ if options['F90'] not in compilers:
|
||||||
|
|
||||||
compiler = {
|
compiler = {
|
||||||
'gfortran': '--fcompiler=gnu95 --f90flags="-fPIC -fno-range-check -xf95-cpp-input -std=f2008 -fall-intrinsics'+\
|
'gfortran': '--fcompiler=gnu95 --f90flags="-fPIC -fno-range-check -xf95-cpp-input -std=f2008 -fall-intrinsics'+\
|
||||||
' -fdefault-real-8 -fdefault-double-8"',
|
' -fdefault-real-8 -fdefault-double-8 -shared"',
|
||||||
'ifort': '--fcompiler=intelem --f90flags="-fPIC -fpp -stand f08 -diag-disable 5268 -assume byterecl'+\
|
'ifort': '--fcompiler=intelem --f90flags="-fPIC -fpp -stand f08 -diag-disable 5268 -assume byterecl'+\
|
||||||
' -real-size 64 -integer-size 32"',
|
' -real-size 64 -integer-size 32 -shared-intel"',
|
||||||
}[options['F90']]
|
}[options['F90']]
|
||||||
|
|
||||||
#--- option not depending on compiler -------------------------------------------------------------
|
#--- option not depending on compiler -------------------------------------------------------------
|
||||||
|
@ -46,9 +46,9 @@ compileOptions = ' -DSpectral -DFLOAT=8 -DINT=4 -I%s/lib'%damaskEnv.rootDir()
|
||||||
|
|
||||||
#--- this saves the path of libraries to core.so, hence it is known during runtime ----------------
|
#--- this saves the path of libraries to core.so, hence it is known during runtime ----------------
|
||||||
if options['F90'] == 'gfortran':
|
if options['F90'] == 'gfortran':
|
||||||
LDFLAGS = '-shared -Wl,-undefined,dynamic_lookup' # solved error: Undefined symbols for architecture x86_64: "_PyArg_ParseTupleAndKeywords" as found on https://lists.macosforge.org/pipermail/macports-dev/2013-May/022735.html
|
LDFLAGS = '-Wl,-undefined,dynamic_lookup' # solved error: Undefined symbols for architecture x86_64: "_PyArg_ParseTupleAndKeywords" as found on https://lists.macosforge.org/pipermail/macports-dev/2013-May/022735.html
|
||||||
else:
|
else:
|
||||||
LDFLAGS = '-shared-intel, -Wl'
|
LDFLAGS = ' -Wl'
|
||||||
|
|
||||||
#--- run path of for fftw during runtime ----------------------------------------------------------
|
#--- run path of for fftw during runtime ----------------------------------------------------------
|
||||||
LDFLAGS += ',-rpath,%s/lib,-rpath,%s/lib64'%(options['FFTW_ROOT'],options['FFTW_ROOT'])
|
LDFLAGS += ',-rpath,%s/lib,-rpath,%s/lib64'%(options['FFTW_ROOT'],options['FFTW_ROOT'])
|
||||||
|
|
Loading…
Reference in New Issue