Merge pull request #31 from eschnett/eschnett/wrappers

Update compiler wrappers

Author: eschnett

CITATION.cff

@@ -5,7 +5,6 @@ authors:
     given-names: Erik
     orcid: 0000-0002-4518-9017
 title: MPItrampoline
-version: v3.8.0
+version: v4.0.0
 doi: 10.5281/zenodo.6174408
-date-released: 2022-03-01
-
+date-released: 2022-04-14

CMakeLists.txt

@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.12...3.20)
 project(
-  MPItrampoline VERSION 3.8.0
+  MPItrampoline VERSION 4.0.0
   DESCRIPTION "MPI trampoline"
   HOMEPAGE_URL "https://github.com/eschnett/MPItrampoline"
   LANGUAGES NONE

bin/mpicc.in

@@ -70,9 +70,9 @@ for arg in "$@"; do
     fi
 done
 
-if !$linking; then
+if [ $linking != true ]; then
     exec $MPITRAMPOLINE_CC $MPITRAMPOLINE_CFLAGS -I@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_INCLUDEDIR@ "$@"
-elif !$add_rpath; then
+elif [ $add_rpath != true ]; then
     exec $MPITRAMPOLINE_CC $MPITRAMPOLINE_CFLAGS -I@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_INCLUDEDIR@ @LINK_FLAGS@ -L@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@ "$@" -lmpitrampoline -ldl
 else
     exec $MPITRAMPOLINE_CC $MPITRAMPOLINE_CFLAGS -I@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_INCLUDEDIR@ @LINK_FLAGS@ -L@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@ -Wl,-rpath,@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@ "$@" -lmpitrampoline -ldl

bin/mpicxx.in

@@ -51,4 +51,29 @@ case "$1" in
         ;;
 esac
 
-exec $MPITRAMPOLINE_CXX $MPITRAMPOLINE_CXXFLAGS -I@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_INCLUDEDIR@ @LINK_FLAGS@ -L@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@ -Wl,-rpath,@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@ "$@" -lmpitrampoline -ldl
+# Are we linking?
+linking=true
+for arg in "$@"; do
+    if [ "$arg" = "-E" -o "$arg" = "-c" -o "$arg" = "-S" ]; then
+        linking=false
+        break
+    fi
+done
+
+# Can we use rpath? (The Darwin linker has an '-r' argument that
+# merges object files together. It does not work with '-rpath'.)
+add_rpath=true
+for arg in "$@"; do
+    if [ "$arg" = "-r" -o "$arg" = "-Wl,-r" ]; then
+        add_rpath=false
+        break
+    fi
+done
+
+if [ $linking != true ]; then
+    exec $MPITRAMPOLINE_CXX $MPITRAMPOLINE_CXXFLAGS -I@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_INCLUDEDIR@ "$@"
+elif [ $add_rpath != true ]; then
+    exec $MPITRAMPOLINE_CXX $MPITRAMPOLINE_CXXFLAGS -I@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_INCLUDEDIR@ @LINK_FLAGS@ -L@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@ "$@" -lmpitrampoline -ldl
+else
+    exec $MPITRAMPOLINE_CXX $MPITRAMPOLINE_CXXFLAGS -I@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_INCLUDEDIR@ @LINK_FLAGS@ -L@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@ -Wl,-rpath,@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@ "$@" -lmpitrampoline -ldl
+fi

bin/mpifc.in

@@ -51,4 +51,29 @@ case "$1" in
         ;;
 esac
 
-exec $MPITRAMPOLINE_FC $MPITRAMPOLINE_FCFLAGS -I@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_INCLUDEDIR@ @LINK_FLAGS@ -L@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@ -Wl,-rpath,@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@ "$@" -lmpitrampoline -ldl
+# Are we linking?
+linking=true
+for arg in "$@"; do
+    if [ "$arg" = "-E" -o "$arg" = "-c" -o "$arg" = "-S" ]; then
+        linking=false
+        break
+    fi
+done
+
+# Can we use rpath? (The Darwin linker has an '-r' argument that
+# merges object files together. It does not work with '-rpath'.)
+add_rpath=true
+for arg in "$@"; do
+    if [ "$arg" = "-r" -o "$arg" = "-Wl,-r" ]; then
+        add_rpath=false
+        break
+    fi
+done
+
+if [ $linking != true ]; then
+    exec $MPITRAMPOLINE_FC $MPITRAMPOLINE_FCFLAGS -I@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_INCLUDEDIR@ "$@"
+elif [ $add_rpath != true ]; then
+    exec $MPITRAMPOLINE_FC $MPITRAMPOLINE_FCFLAGS -I@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_INCLUDEDIR@ @LINK_FLAGS@ -L@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@ "$@" -lmpitrampoline -ldl
+else
+    exec $MPITRAMPOLINE_FC $MPITRAMPOLINE_FCFLAGS -I@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_INCLUDEDIR@ @LINK_FLAGS@ -L@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@ -Wl,-rpath,@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@ "$@" -lmpitrampoline -ldl
+fi

bin/mpifort.in

@@ -51,4 +51,29 @@ case "$1" in
         ;;
 esac
 
-exec $MPITRAMPOLINE_FC $MPITRAMPOLINE_FCFLAGS -I@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_INCLUDEDIR@ @LINK_FLAGS@ -L@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@ -Wl,-rpath,@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@ "$@" -lmpitrampoline -ldl
+# Are we linking?
+linking=true
+for arg in "$@"; do
+    if [ "$arg" = "-E" -o "$arg" = "-c" -o "$arg" = "-S" ]; then
+        linking=false
+        break
+    fi
+done
+
+# Can we use rpath? (The Darwin linker has an '-r' argument that
+# merges object files together. It does not work with '-rpath'.)
+add_rpath=true
+for arg in "$@"; do
+    if [ "$arg" = "-r" -o "$arg" = "-Wl,-r" ]; then
+        add_rpath=false
+        break
+    fi
+done
+
+if [ $linking != true ]; then
+    exec $MPITRAMPOLINE_FC $MPITRAMPOLINE_FCFLAGS -I@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_INCLUDEDIR@ "$@"
+elif [ $add_rpath != true ]; then
+    exec $MPITRAMPOLINE_FC $MPITRAMPOLINE_FCFLAGS -I@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_INCLUDEDIR@ @LINK_FLAGS@ -L@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@ "$@" -lmpitrampoline -ldl
+else
+    exec $MPITRAMPOLINE_FC $MPITRAMPOLINE_FCFLAGS -I@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_INCLUDEDIR@ @LINK_FLAGS@ -L@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@ -Wl,-rpath,@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@ "$@" -lmpitrampoline -ldl
+fi