From 517e2afa7cf306473943e461a3072a3d1b354004 Mon Sep 17 00:00:00 2001 From: Augustin Degomme Date: Wed, 13 May 2020 14:11:37 +0200 Subject: [PATCH] disable on osx as -z is not supported there --- src/smpi/smpicc.in | 5 ++++- src/smpi/smpicxx.in | 5 ++++- src/smpi/smpif90.in | 5 ++++- src/smpi/smpiff.in | 5 ++++- 4 files changed, 16 insertions(+), 4 deletions(-) diff --git a/src/smpi/smpicc.in b/src/smpi/smpicc.in index 60c0e45ff8..8ec8ddea9a 100755 --- a/src/smpi/smpicc.in +++ b/src/smpi/smpicc.in @@ -32,7 +32,10 @@ elif [ "x@APPLE@" = "x1" ]; then list_add CFLAGS "-include" "@includedir@/smpi/smpi_helpers.h" list_add CFLAGS "-fPIC" if [ "x${SMPI_PRETEND_CC}" = "x" ]; then - list_add LINKARGS "-shared" "-Wl,-z,defs" + list_add LINKARGS "-shared" + if [ "@APPLE@" != "1" ]; then + list_add LINKARGS "-Wl,-z,defs" + fi else echo "Warning: smpicc pretends to be a regular compiler (SMPI_PRETEND_CC is set). Produced binaries will not be usable in SimGrid." fi diff --git a/src/smpi/smpicxx.in b/src/smpi/smpicxx.in index 414b1f3d7f..85463d942c 100755 --- a/src/smpi/smpicxx.in +++ b/src/smpi/smpicxx.in @@ -22,7 +22,10 @@ if [ "@WIN32@" != "1" ]; then list_add CXXFLAGS "-include" "@includedir@/smpi/smpi_helpers.h" list_add CXXFLAGS "-fPIC" if [ "x${SMPI_PRETEND_CC}" = "x" ]; then - list_add LINKARGS "-shared" "-Wl,-z,defs" + list_add LINKARGS "-shared" + if [ "@APPLE@" != "1" ]; then + list_add LINKARGS "-Wl,-z,defs" + fi else echo "Warning: smpicxx pretends to be a regular compiler (SMPI_PRETEND_CC is set). Produced binaries will not be usable in SimGrid." fi diff --git a/src/smpi/smpif90.in b/src/smpi/smpif90.in index 61494c3467..40ee29a6c1 100644 --- a/src/smpi/smpif90.in +++ b/src/smpi/smpif90.in @@ -18,7 +18,10 @@ CMAKE_LINKARGS="-L@libdir@" list_set FFLAGS @SMPI_Fortran_FLAGS@ list_set LINKARGS "-lsimgrid" @SMPI_Fortran_LIBS@ "-lm" if [ "x${SMPI_PRETEND_CC}" = "x" ]; then - list_add LINKARGS "-shared" "-Wl,-z,defs" + list_add LINKARGS "-shared" + if [ "@APPLE@" != "1" ]; then + list_add LINKARGS "-Wl,-z,defs" + fi else echo "Warning: smpif90 pretends to be a regular compiler (SMPI_PRETEND_CC is set). Produced binaries will not be usable in SimGrid." fi diff --git a/src/smpi/smpiff.in b/src/smpi/smpiff.in index 2c2b152965..a41a2f7eb4 100644 --- a/src/smpi/smpiff.in +++ b/src/smpi/smpiff.in @@ -18,7 +18,10 @@ CMAKE_LINKARGS="-L@libdir@" list_set FFLAGS @SMPI_Fortran_FLAGS@ list_set LINKARGS "-lsimgrid" @SMPI_Fortran_LIBS@ "-lm" if [ "x${SMPI_PRETEND_CC}" = "x" ]; then - list_add LINKARGS "-shared" "-Wl,-z,defs" + list_add LINKARGS "-shared" + if [ "@APPLE@" != "1" ]; then + list_add LINKARGS "-Wl,-z,defs" + fi else echo "Warning: smpiff pretends to be a regular compiler (SMPI_PRETEND_CC is set). Produced binaries will not be usable in SimGrid." fi -- 2.20.1