33 lines
1.7 KiB
Diff
33 lines
1.7 KiB
Diff
|
---
|
||
|
|
config/BuildSystem/config/setCompilers.py | 2 +-
|
||
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||
|
|
|
||
|
|
--- config/BuildSystem/config/setCompilers.py
|
||
|
|
+++ config/BuildSystem/config/setCompilers.py
|
||
|
|
@@ -1387,7 +1387,7 @@
|
||
|
|
self.pushLanguage(language)
|
||
|
|
# test '-R' before '-rpath' as sun compilers [c,fortran] don't give proper errors with wrong options.
|
||
|
|
if not Configure.isDarwin(self.log):
|
||
|
|
- testFlags = ['-Wl,-rpath,', '-R','-rpath ' , '-Wl,-R,']
|
||
|
|
+ testFlags = []
|
||
|
|
else:
|
||
|
|
testFlags = ['-Wl,-rpath,']
|
||
|
|
# test '-R' before '-Wl,-rpath' for SUN compilers [as cc on linux accepts -Wl,-rpath, but f90 & CC do not.
|
||
|
|
--- gmakefile.orig 2016-05-16 04:57:35.000000000 +0200
|
||
|
|
+++ gmakefile 2016-06-22 13:59:47.905111833 +0200
|
||
|
|
@@ -29,10 +30,10 @@
|
||
|
|
basename_all = $(basename $(basename $(basename $(basename $(1)))))
|
||
|
|
sl_linker_args = $(call SL_LINKER_FUNCTION,$(call basename_all,$@),$(libpetsc_abi_version),$(libpetsc_lib_version))
|
||
|
|
|
||
|
|
-libpetsc_shared := $(LIBDIR)/libpetsc.$(SL_LINKER_SUFFIX)
|
||
|
|
-libpetsc_soname := $(call soname_function,$(LIBDIR)/libpetsc)
|
||
|
|
-libpetsc_libname := $(call libname_function,$(LIBDIR)/libpetsc)
|
||
|
|
-libpetsc_static := $(LIBDIR)/libpetsc.$(AR_LIB_SUFFIX)
|
||
|
|
+libpetsc_shared := $(LIBDIR)/libpetsc64.$(SL_LINKER_SUFFIX)
|
||
|
|
+libpetsc_soname := $(call soname_function,$(LIBDIR)/libpetsc64)
|
||
|
|
+libpetsc_libname := $(call libname_function,$(LIBDIR)/libpetsc64)
|
||
|
|
+libpetsc_static := $(LIBDIR)/libpetsc64.$(AR_LIB_SUFFIX)
|
||
|
|
libpetscpkgs_shared := $(foreach pkg, $(pkgs), $(LIBDIR)/libpetsc$(pkg).$(SL_LINKER_SUFFIX))
|
||
|
|
libpetscpkgs_soname := $(foreach pkg, $(pkgs), $(call soname_function,$(LIBDIR)/libpetsc$(pkg)))
|
||
|
|
libpetscpkgs_libname := $(foreach pkg, $(pkgs), $(call libname_function,$(LIBDIR)/libpetsc$(pkg)))
|