From c18a2a63709ade35aaa5408be6788f0f16047d33 Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Wed, 16 May 2018 12:36:29 +0100 Subject: [PATCH] BUG: compiler-specific INTELMPI not always found (closes #830) - tie the MPI rules to the base compiler type *without* its version. Eg, linux64Gcc (which exists) instead of linux64Gcc81 --- src/Pstream/mpi/Make/options | 2 +- src/parallel/decompose/ptscotchDecomp/Make/options | 2 +- src/parallel/decompose/scotchDecomp/Make/options | 2 +- src/renumber/zoltanRenumber/Make/options | 2 +- wmake/rules/General/ADIOS | 2 +- wmake/rules/General/ADIOS2 | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Pstream/mpi/Make/options b/src/Pstream/mpi/Make/options index 43a48312c4..8fcb7016f8 100644 --- a/src/Pstream/mpi/Make/options +++ b/src/Pstream/mpi/Make/options @@ -1,5 +1,5 @@ sinclude $(GENERAL_RULES)/mplib$(WM_MPLIB) -sinclude $(RULES)/mplib$(WM_MPLIB) +sinclude $(DEFAULT_RULES)/mplib$(WM_MPLIB) EXE_INC = $(PFLAGS) $(PINC) $(c++LESSWARN) LIB_LIBS = $(PLIBS) diff --git a/src/parallel/decompose/ptscotchDecomp/Make/options b/src/parallel/decompose/ptscotchDecomp/Make/options index 51ae4a6662..3a1fd5b88b 100644 --- a/src/parallel/decompose/ptscotchDecomp/Make/options +++ b/src/parallel/decompose/ptscotchDecomp/Make/options @@ -1,5 +1,5 @@ sinclude $(GENERAL_RULES)/mplib$(WM_MPLIB) -sinclude $(RULES)/mplib$(WM_MPLIB) +sinclude $(DEFAULT_RULES)/mplib$(WM_MPLIB) EXE_INC = \ $(PFLAGS) $(PINC) \ diff --git a/src/parallel/decompose/scotchDecomp/Make/options b/src/parallel/decompose/scotchDecomp/Make/options index 1ca71f6a68..5a15e38820 100644 --- a/src/parallel/decompose/scotchDecomp/Make/options +++ b/src/parallel/decompose/scotchDecomp/Make/options @@ -3,7 +3,7 @@ * This is purely to avoid scotch.h including mpicxx.h, which causes problems. */ sinclude $(GENERAL_RULES)/mplib$(WM_MPLIB) -sinclude $(RULES)/mplib$(WM_MPLIB) +sinclude $(DEFAULT_RULES)/mplib$(WM_MPLIB) EXE_INC = \ $(PFLAGS) $(PINC) \ diff --git a/src/renumber/zoltanRenumber/Make/options b/src/renumber/zoltanRenumber/Make/options index e92e24e096..406b96aa94 100644 --- a/src/renumber/zoltanRenumber/Make/options +++ b/src/renumber/zoltanRenumber/Make/options @@ -1,5 +1,5 @@ sinclude $(GENERAL_RULES)/mplib$(WM_MPLIB) -sinclude $(RULES)/mplib$(WM_MPLIB) +sinclude $(DEFAULT_RULES)/mplib$(WM_MPLIB) EXE_INC = \ /* -DFULLDEBUG -g -O0 */ \ diff --git a/wmake/rules/General/ADIOS b/wmake/rules/General/ADIOS index 87bda2c752..c2cb3558ae 100644 --- a/wmake/rules/General/ADIOS +++ b/wmake/rules/General/ADIOS @@ -2,7 +2,7 @@ # ADIOS includes/libraries sinclude $(GENERAL_RULES)/mplib$(WM_MPLIB) -sinclude $(RULES)/mplib$(WM_MPLIB) +sinclude $(DEFAULT_RULES)/mplib$(WM_MPLIB) # Obtain compile/link flags via adios_config ADIOS_INC := $(shell $(ADIOS_ARCH_PATH)/bin/adios_config -c) diff --git a/wmake/rules/General/ADIOS2 b/wmake/rules/General/ADIOS2 index f158236942..c880d0c3b9 100644 --- a/wmake/rules/General/ADIOS2 +++ b/wmake/rules/General/ADIOS2 @@ -2,7 +2,7 @@ # ADIOS2 includes/libraries sinclude $(GENERAL_RULES)/mplib$(WM_MPLIB) -sinclude $(RULES)/mplib$(WM_MPLIB) +sinclude $(DEFAULT_RULES)/mplib$(WM_MPLIB) # Obtain prefix and library information via adios2-config ADIOS_PREFIX := $(shell $(ADIOS2_ARCH_PATH)/bin/adios2-config --prefix)