Use more obvious name of BGQ compiler MPI wrappers

While it is true that mpicc points to the XL compilers when it is the
one found in xl.ndebug/bin, this is not generally true and thus the use
of mpicc as a wrapper for XL violates the principle of least surprise.
the mpixl* wrappers are unambiguous and equally valid.

Fixes #1282

Change-Id: I460e829e55a221d8be35a70932864555feb21a95

diff --git a/cmake/Platform/BlueGeneQ-static-XL-C.cmake b/cmake/Platform/BlueGeneQ-static-XL-C.cmake
index b2100b51aa0f3cb09e9692d1006f7186590eefa7..bf369d558777bd57c44438a2f90519d3fca01bd4 100644 (file)
--- a/cmake/Platform/BlueGeneQ-static-XL-C.cmake
+++ b/cmake/Platform/BlueGeneQ-static-XL-C.cmake
@@ -20,7 +20,7 @@ __BlueGeneQ_set_static_flags(XL C)
 set(CMAKE_SYSTEM_NAME BlueGeneQ-static)
 # xl.ndebug is appropriate for production calculations. For debugging,
 # use xl to add back error checks and assertions
-set(CMAKE_C_COMPILER /bgsys/drivers/ppcfloor/comm/xl.ndebug/bin/mpicc)
+set(CMAKE_C_COMPILER /bgsys/drivers/ppcfloor/comm/xl.ndebug/bin/mpixlc_r)
 set(CMAKE_C_FLAGS_RELEASE "-O4 -DNDEBUG" CACHE STRING "Compiler optimization flags")
 
 mark_as_advanced(CMAKE_XL_CreateExportList) # No idea what spams this

diff --git a/cmake/Platform/BlueGeneQ-static-XL-CXX.cmake b/cmake/Platform/BlueGeneQ-static-XL-CXX.cmake
index d43ccb3f66028de24ac434c611ad370a2123a329..98cac37f8403993871da8a258cf7f12d2eea69f0 100644 (file)
--- a/cmake/Platform/BlueGeneQ-static-XL-CXX.cmake
+++ b/cmake/Platform/BlueGeneQ-static-XL-CXX.cmake
@@ -20,7 +20,7 @@ __BlueGeneQ_set_static_flags(XL CXX)
 set(CMAKE_SYSTEM_NAME BlueGeneQ-static CACHE STRING "Cross-compiling for BlueGene/Q" FORCE)
 # xl.ndebug is appropriate for production calculations. For debugging,
 # use xl to add back error checks and assertions
-set(CMAKE_CXX_COMPILER /bgsys/drivers/ppcfloor/comm/xl.ndebug/bin/mpicxx)
+set(CMAKE_CXX_COMPILER /bgsys/drivers/ppcfloor/comm/xl.ndebug/bin/mpixlcxx_r)
 set(CMAKE_CXX_FLAGS_RELEASE "-O4 -DNDEBUG" CACHE STRING "Compiler optimization flags")
 
 mark_as_advanced(CMAKE_XL_CreateExportList) # No idea what spams this