diff --git a/Makefile.in b/Makefile.in
index 3cc8e9f5ddb71df49976d8f7d4c7ea65680acf29..1bd842201bc2cadfb65b4f0ef466057cfe791e1b 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -238,6 +238,8 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CRAY_CPPFLAGS = @CRAY_CPPFLAGS@
CRAY_LDFLAGS = @CRAY_LDFLAGS@
+CRAY_SWITCH_CPPFLAGS = @CRAY_SWITCH_CPPFLAGS@
+CRAY_SWITCH_LDFLAGS = @CRAY_SWITCH_LDFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
diff --git a/auxdir/Makefile.in b/auxdir/Makefile.in
index 3d74a43f30935637d6925502b5c29c4044ad0f0f..69fb7f9ce30e5bc64cb7cae4153994e4fa2890cf 100644
--- a/auxdir/Makefile.in
+++ b/auxdir/Makefile.in
@@ -139,6 +139,8 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CRAY_CPPFLAGS = @CRAY_CPPFLAGS@
CRAY_LDFLAGS = @CRAY_LDFLAGS@
+CRAY_SWITCH_CPPFLAGS = @CRAY_SWITCH_CPPFLAGS@
+CRAY_SWITCH_LDFLAGS = @CRAY_SWITCH_LDFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
diff --git a/configure b/configure
index 537392eb6d38e2f265f30cf67af0463851756b94..f64266ae45feb47297ff2209ab705a6965bbce19 100755
--- a/configure
+++ b/configure
@@ -681,6 +681,8 @@ SLURMD_PORT
SLURMCTLD_PORT
DEBUG_MODULES_FALSE
DEBUG_MODULES_TRUE
+CRAY_SWITCH_LDFLAGS
+CRAY_SWITCH_CPPFLAGS
CRAY_LDFLAGS
CRAY_CPPFLAGS
HAVE_ALPS_CRAY_EMULATION_FALSE
@@ -21908,30 +21910,71 @@ $as_echo "$as_me: Running in Cray emulation mode" >&6;}
$as_echo "#define HAVE_ALPS_CRAY_EMULATION 1" >>confdefs.h
elif test "$ac_have_native_cray" = "yes"; then
- _x_ac_cray_dirs="/opt/cray/job/default"
+ _x_ac_cray_job_dir="job/default"
+ _x_ac_cray_alps_dir="alps/default"
+ _x_ac_cray_alpscomm_dir="alpscomm/default"
+
+ _x_ac_cray_dirs="/opt/cray"
for d in $_x_ac_cray_dirs; do
test -d "$d" || continue
- test -d "$d/include" || continue
- test -f "$d/include/job.h" || continue
- test -d "$d/lib64" || continue
- test -f "$d/lib64/libjob.so" || continue
- saved_CPPFLAGS="$CPPFLAGS"
- CRAY_CPPFLAGS="-I$d/include"
- CPPFLAGS="$CRAY_CPPFLAGS $saved_CPPFLAGS"
+ _test_dir="$d/$_x_ac_cray_job_dir"
+ test -d "$_test_dir" || continue
+ test -d "$_test_dir/include" || continue
+ test -f "$_test_dir/include/job.h" || continue
+ test -d "$_test_dir/lib64" || continue
+ test -f "$_test_dir/lib64/libjob.so" || continue
+ saved_CPPFLAGS="$CPPFLAGS"
saved_LIBS="$LIBS"
- CRAY_LDFLAGS="-L$d/lib64 -ljob"
- LIBS="$CRAY_LDFLAGS $saved_LIBS"
+ CRAY_CPPFLAGS="-I$_test_dir/include"
+ CRAY_LDFLAGS="-L$_test_dir/lib64 -ljob"
+
+ _test_dir="$d/$_x_ac_cray_alps_dir"
+ test -d "$_test_dir" || continue
+ test -d "$_test_dir/include" || continue
+ test -f "$_test_dir/include/alps/libalpslli.h" || continue
+ test -d "$_test_dir/lib64" || continue
+ test -f "$_test_dir/lib64/libalpslli.so" || continue
+
+ CRAY_SWITCH_CPPFLAGS="-I$_test_dir/include"
+ CRAY_SWITCH_LDFLAGS="-L$_test_dir/lib64 -lalpslli"
+
+ _test_dir="$d/$_x_ac_cray_alpscomm_dir"
+ test -d "$_test_dir" || continue
+ test -d "$_test_dir/include" || continue
+ test -f "$_test_dir/include/alpscomm_cn.h" || continue
+ test -f "$_test_dir/include/alpscomm_sn.h" || continue
+ test -d "$_test_dir/lib64" || continue
+ test -f "$_test_dir/lib64/libalpscomm_cn.so" || continue
+ test -f "$_test_dir/lib64/libalpscomm_sn.so" || continue
+
+ CRAY_SWITCH_CPPFLAGS="$CRAY_SWITCH_CPPFLAGS -I$_test_dir/include"
+ CRAY_SWITCH_LDFLAGS="$CRAY_SWITCH_LDFLAGS -L$_test_dir/lib64 -lalpscomm_cn -lalpscomm_sn"
+
+ CPPFLAGS="$CRAY_CPPFLAGS $CRAY_SWITCH_CPPFLAGS $saved_CPPFLAGS"
+ LIBS="$CRAY_LDFLAGS $CRAY_SWITCH_LDFLAGS $saved_LIBS"
+
+# FIXME: alpscomm_cn.h appeared to not work correctly here. Needs further
+# looking into
+# #include <alpscomm_cn.h>
+# alpsc_flush_lustre("");
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <job.h>
+ #include <alps/libalpslli.h>
+ #include <alpscomm_sn.h>
+
int
main ()
{
job_getjidcnt();
+ alps_app_lli_init();
+ alpsc_release_cookies("", 0, 0);
+
+
;
return 0;
}
@@ -21950,7 +21993,7 @@ rm -f core conftest.err conftest.$ac_objext \
done
if test -z "$have_cray_files"; then
- as_fn_error $? "Unable to locate Cray API dir install. (usually in /opt/cray/job/default)" "$LINENO" 5
+ as_fn_error $? "Unable to locate Cray API dir install. (usually in /opt/cray)" "$LINENO" 5
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: Running on a Cray system in native mode without ALPS" >&5
$as_echo "$as_me: Running on a Cray system in native mode without ALPS" >&6;}
@@ -22174,6 +22217,8 @@ fi
+
+
#
case "$host" in
*-*-aix*)
diff --git a/contribs/Makefile.in b/contribs/Makefile.in
index 1f3c8a79fded2f9aa5502842d408094b640c3699..8d1ca8ab7e8c7b64414642d4d469c4299b684449 100644
--- a/contribs/Makefile.in
+++ b/contribs/Makefile.in
@@ -178,6 +178,8 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CRAY_CPPFLAGS = @CRAY_CPPFLAGS@
CRAY_LDFLAGS = @CRAY_LDFLAGS@
+CRAY_SWITCH_CPPFLAGS = @CRAY_SWITCH_CPPFLAGS@
+CRAY_SWITCH_LDFLAGS = @CRAY_SWITCH_LDFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
diff --git a/contribs/cray/Makefile.in b/contribs/cray/Makefile.in
index 1e85899ba0700bcc60937150e6ccdcbed6183940..39fbef6a62efa707a316914c2af274ec96254b8a 100644
--- a/contribs/cray/Makefile.in
+++ b/contribs/cray/Makefile.in
@@ -143,6 +143,8 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CRAY_CPPFLAGS = @CRAY_CPPFLAGS@
CRAY_LDFLAGS = @CRAY_LDFLAGS@
+CRAY_SWITCH_CPPFLAGS = @CRAY_SWITCH_CPPFLAGS@
+CRAY_SWITCH_LDFLAGS = @CRAY_SWITCH_LDFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
diff --git a/contribs/lua/Makefile.in b/contribs/lua/Makefile.in
index 641bc49cb48aee798898753fe66344fb020169d7..3e0fb9bf37c2e2bee2560ef66dbbf7191b5150f4 100644
--- a/contribs/lua/Makefile.in
+++ b/contribs/lua/Makefile.in
@@ -138,6 +138,8 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CRAY_CPPFLAGS = @CRAY_CPPFLAGS@
CRAY_LDFLAGS = @CRAY_LDFLAGS@
+CRAY_SWITCH_CPPFLAGS = @CRAY_SWITCH_CPPFLAGS@
+CRAY_SWITCH_LDFLAGS = @CRAY_SWITCH_LDFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
diff --git a/contribs/mic/Makefile.in b/contribs/mic/Makefile.in
index 237f94e04b46b310e0c46ded9309030e1c59b59d..9196c37c5970955c1a62cacdcfea9b5d1db7e459 100644
--- a/contribs/mic/Makefile.in
+++ b/contribs/mic/Makefile.in
@@ -138,6 +138,8 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CRAY_CPPFLAGS = @CRAY_CPPFLAGS@
CRAY_LDFLAGS = @CRAY_LDFLAGS@
+CRAY_SWITCH_CPPFLAGS = @CRAY_SWITCH_CPPFLAGS@
+CRAY_SWITCH_LDFLAGS = @CRAY_SWITCH_LDFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
diff --git a/contribs/pam/Makefile.in b/contribs/pam/Makefile.in
index 286e0b017e24e82d6509a54ee261184fd33212bf..eab629b20530ead6f6ce395f584786f3e9a85bce 100644
--- a/contribs/pam/Makefile.in
+++ b/contribs/pam/Makefile.in
@@ -198,6 +198,8 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CRAY_CPPFLAGS = @CRAY_CPPFLAGS@
CRAY_LDFLAGS = @CRAY_LDFLAGS@
+CRAY_SWITCH_CPPFLAGS = @CRAY_SWITCH_CPPFLAGS@
+CRAY_SWITCH_LDFLAGS = @CRAY_SWITCH_LDFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
diff --git a/contribs/perlapi/Makefile.in b/contribs/perlapi/Makefile.in
index 0f464306a174f29ae46bbaa8e64f727dc83ca67b..1e4aed17cd8fb24be915267a7fed4fcb89fa45e9 100644
--- a/contribs/perlapi/Makefile.in
+++ b/contribs/perlapi/Makefile.in
@@ -178,6 +178,8 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CRAY_CPPFLAGS = @CRAY_CPPFLAGS@
CRAY_LDFLAGS = @CRAY_LDFLAGS@
+CRAY_SWITCH_CPPFLAGS = @CRAY_SWITCH_CPPFLAGS@
+CRAY_SWITCH_LDFLAGS = @CRAY_SWITCH_LDFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
diff --git a/contribs/perlapi/libslurm/Makefile.in b/contribs/perlapi/libslurm/Makefile.in
index f3f721b5f53f28b7aaf12439be0523ada4b085a3..3f687b0b9d95797dc6ca76cb0a41dc33edc5974a 100644
--- a/contribs/perlapi/libslurm/Makefile.in
+++ b/contribs/perlapi/libslurm/Makefile.in
@@ -138,6 +138,8 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CRAY_CPPFLAGS = @CRAY_CPPFLAGS@
CRAY_LDFLAGS = @CRAY_LDFLAGS@
+CRAY_SWITCH_CPPFLAGS = @CRAY_SWITCH_CPPFLAGS@
+CRAY_SWITCH_LDFLAGS = @CRAY_SWITCH_LDFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
diff --git a/contribs/perlapi/libslurmdb/Makefile.in b/contribs/perlapi/libslurmdb/Makefile.in
index c40d5f3276054c230518293e327d67cc6160e67f..e2b023f489590f16a277a03f050ed5a5a1beb39d 100644
--- a/contribs/perlapi/libslurmdb/Makefile.in
+++ b/contribs/perlapi/libslurmdb/Makefile.in
@@ -138,6 +138,8 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CRAY_CPPFLAGS = @CRAY_CPPFLAGS@
CRAY_LDFLAGS = @CRAY_LDFLAGS@
+CRAY_SWITCH_CPPFLAGS = @CRAY_SWITCH_CPPFLAGS@
+CRAY_SWITCH_LDFLAGS = @CRAY_SWITCH_LDFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
diff --git a/contribs/phpext/Makefile.in b/contribs/phpext/Makefile.in
index cf8bda1a326c1f73423121017d72ff2a31fe330e..1ec9d8cf105f8a500b0674d02ebaa2e6185fbfa0 100644
--- a/contribs/phpext/Makefile.in
+++ b/contribs/phpext/Makefile.in
@@ -138,6 +138,8 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CRAY_CPPFLAGS = @CRAY_CPPFLAGS@
CRAY_LDFLAGS = @CRAY_LDFLAGS@
+CRAY_SWITCH_CPPFLAGS = @CRAY_SWITCH_CPPFLAGS@
+CRAY_SWITCH_LDFLAGS = @CRAY_SWITCH_LDFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
diff --git a/contribs/pmi2/Makefile.in b/contribs/pmi2/Makefile.in
index 46f09cd1f881f27fc5d34eb57f3ba621a8185cf9..3c1737748dd3b1c82014a55850af6ca7f9dac6e5 100644
--- a/contribs/pmi2/Makefile.in
+++ b/contribs/pmi2/Makefile.in
@@ -195,6 +195,8 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CRAY_CPPFLAGS = @CRAY_CPPFLAGS@
CRAY_LDFLAGS = @CRAY_LDFLAGS@
+CRAY_SWITCH_CPPFLAGS = @CRAY_SWITCH_CPPFLAGS@
+CRAY_SWITCH_LDFLAGS = @CRAY_SWITCH_LDFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
diff --git a/contribs/sjobexit/Makefile.in b/contribs/sjobexit/Makefile.in
index 3e3fff032817734d2bc6ac8e7243fa9ea5c24623..02fae55a62e1bb2870c8251d867dccfad6e3ba98 100644
--- a/contribs/sjobexit/Makefile.in
+++ b/contribs/sjobexit/Makefile.in
@@ -171,6 +171,8 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CRAY_CPPFLAGS = @CRAY_CPPFLAGS@
CRAY_LDFLAGS = @CRAY_LDFLAGS@
+CRAY_SWITCH_CPPFLAGS = @CRAY_SWITCH_CPPFLAGS@
+CRAY_SWITCH_LDFLAGS = @CRAY_SWITCH_LDFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
diff --git a/contribs/slurmdb-direct/Makefile.in b/contribs/slurmdb-direct/Makefile.in
index 675dcc784ddf3fe448a7e66e66aab050aebe1399..999e5e7af74ce4df679fa1aba5e2a0e65cadc589 100644
--- a/contribs/slurmdb-direct/Makefile.in
+++ b/contribs/slurmdb-direct/Makefile.in
@@ -171,6 +171,8 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CRAY_CPPFLAGS = @CRAY_CPPFLAGS@
CRAY_LDFLAGS = @CRAY_LDFLAGS@
+CRAY_SWITCH_CPPFLAGS = @CRAY_SWITCH_CPPFLAGS@
+CRAY_SWITCH_LDFLAGS = @CRAY_SWITCH_LDFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
diff --git a/contribs/torque/Makefile.in b/contribs/torque/Makefile.in
index 3f690fb3760bdd4afd32e1ac16756524292103b4..da6cb19ae3a2a52e10546097edc3018731604b7b 100644
--- a/contribs/torque/Makefile.in
+++ b/contribs/torque/Makefile.in
@@ -171,6 +171,8 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CRAY_CPPFLAGS = @CRAY_CPPFLAGS@
CRAY_LDFLAGS = @CRAY_LDFLAGS@
+CRAY_SWITCH_CPPFLAGS = @CRAY_SWITCH_CPPFLAGS@
+CRAY_SWITCH_LDFLAGS = @CRAY_SWITCH_LDFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
diff --git a/doc/Makefile.in b/doc/Makefile.in
index ab13bd4455a9d609cd81d392c517e30120a4a5bb..62eacbb380e45a12e9d8fa8d78ae56e22a32b05a 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -178,6 +178,8 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CRAY_CPPFLAGS = @CRAY_CPPFLAGS@
CRAY_LDFLAGS = @CRAY_LDFLAGS@
+CRAY_SWITCH_CPPFLAGS = @CRAY_SWITCH_CPPFLAGS@
+CRAY_SWITCH_LDFLAGS = @CRAY_SWITCH_LDFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
diff --git a/doc/html/Makefile.in b/doc/html/Makefile.in
index 2f94bdfe0445ee1a5bb4553f36ebef8da3176893..00b5a3cc2b8ed95ed616bdd047042d4792699714 100644
--- a/doc/html/Makefile.in
+++ b/doc/html/Makefile.in
@@ -170,6 +170,8 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CRAY_CPPFLAGS = @CRAY_CPPFLAGS@
CRAY_LDFLAGS = @CRAY_LDFLAGS@
+CRAY_SWITCH_CPPFLAGS = @CRAY_SWITCH_CPPFLAGS@
+CRAY_SWITCH_LDFLAGS = @CRAY_SWITCH_LDFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
diff --git a/doc/man/Makefile.in b/doc/man/Makefile.in
index a0805274ea49a225d733cf83bcd92645b5c9f640..f42b42635d0cf5b6cd3939516a6c080496128e63 100644
--- a/doc/man/Makefile.in
+++ b/doc/man/Makefile.in
@@ -178,6 +178,8 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CRAY_CPPFLAGS = @CRAY_CPPFLAGS@
CRAY_LDFLAGS = @CRAY_LDFLAGS@
+CRAY_SWITCH_CPPFLAGS = @CRAY_SWITCH_CPPFLAGS@
+CRAY_SWITCH_LDFLAGS = @CRAY_SWITCH_LDFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
diff --git a/doc/man/man1/Makefile.in b/doc/man/man1/Makefile.in
index b53349fb7de6d39ec0068c6efc6cf6809c826069..d92affe884e6a732ae0d6ddaf12d61ab5ff64e13 100644
--- a/doc/man/man1/Makefile.in
+++ b/doc/man/man1/Makefile.in
@@ -172,6 +172,8 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CRAY_CPPFLAGS = @CRAY_CPPFLAGS@
CRAY_LDFLAGS = @CRAY_LDFLAGS@
+CRAY_SWITCH_CPPFLAGS = @CRAY_SWITCH_CPPFLAGS@
+CRAY_SWITCH_LDFLAGS = @CRAY_SWITCH_LDFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
diff --git a/doc/man/man3/Makefile.in b/doc/man/man3/Makefile.in
index e42d40085941f548e284a02aa8502c3fd6744b13..e670344e51823aaaa9eaeab172c2bd820add6d5a 100644
--- a/doc/man/man3/Makefile.in
+++ b/doc/man/man3/Makefile.in
@@ -169,6 +169,8 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CRAY_CPPFLAGS = @CRAY_CPPFLAGS@
CRAY_LDFLAGS = @CRAY_LDFLAGS@
+CRAY_SWITCH_CPPFLAGS = @CRAY_SWITCH_CPPFLAGS@
+CRAY_SWITCH_LDFLAGS = @CRAY_SWITCH_LDFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
diff --git a/doc/man/man5/Makefile.in b/doc/man/man5/Makefile.in
index 8bceebce56046cd90ac1334e7dedbc46bf43b416..1f9940a5c089d128592438fb2a063418b95f6f75 100644
--- a/doc/man/man5/Makefile.in
+++ b/doc/man/man5/Makefile.in
@@ -172,6 +172,8 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CRAY_CPPFLAGS = @CRAY_CPPFLAGS@
CRAY_LDFLAGS = @CRAY_LDFLAGS@
+CRAY_SWITCH_CPPFLAGS = @CRAY_SWITCH_CPPFLAGS@
+CRAY_SWITCH_LDFLAGS = @CRAY_SWITCH_LDFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
diff --git a/doc/man/man8/Makefile.in b/doc/man/man8/Makefile.in
index b9cf3ba0735c50feac7b88f6805d38edf7b003cd..9fde5e89452e8f48eaeb559130ad7d34bf7a998c 100644
--- a/doc/man/man8/Makefile.in
+++ b/doc/man/man8/Makefile.in
@@ -172,6 +172,8 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CRAY_CPPFLAGS = @CRAY_CPPFLAGS@
CRAY_LDFLAGS = @CRAY_LDFLAGS@
+CRAY_SWITCH_CPPFLAGS = @CRAY_SWITCH_CPPFLAGS@
+CRAY_SWITCH_LDFLAGS = @CRAY_SWITCH_LDFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
diff --git a/src/Makefile.in b/src/Makefile.in
index 10f5d162559ebccf40efc2614d8cd9846750e0ef..de6f96cd3d321d190a643c8e0e6bf4153b402704 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -182,6 +182,8 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CRAY_CPPFLAGS = @CRAY_CPPFLAGS@
CRAY_LDFLAGS = @CRAY_LDFLAGS@
+CRAY_SWITCH_CPPFLAGS = @CRAY_SWITCH_CPPFLAGS@
+CRAY_SWITCH_LDFLAGS = @CRAY_SWITCH_LDFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
diff --git a/src/api/Makefile.in b/src/api/Makefile.in
index c9fc6cce99a58a9dfc5adcaea527cd8fc9db57ae..e3299b977ed71d331be44dc429551d3aab9e1370 100644
--- a/src/api/Makefile.in
+++ b/src/api/Makefile.in
@@ -221,6 +221,8 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CRAY_CPPFLAGS = @CRAY_CPPFLAGS@
CRAY_LDFLAGS = @CRAY_LDFLAGS@
+CRAY_SWITCH_CPPFLAGS = @CRAY_SWITCH_CPPFLAGS@
+CRAY_SWITCH_LDFLAGS = @CRAY_SWITCH_LDFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
diff --git a/src/common/Makefile.in b/src/common/Makefile.in
index 8903227bf21c1d37655e04e21d6ce0aa1c1bb4c7..579a369c3352e6672e0a137dbc1fad4bb5a863d7 100644
--- a/src/common/Makefile.in
+++ b/src/common/Makefile.in
@@ -272,6 +272,8 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CRAY_CPPFLAGS = @CRAY_CPPFLAGS@
CRAY_LDFLAGS = @CRAY_LDFLAGS@
+CRAY_SWITCH_CPPFLAGS = @CRAY_SWITCH_CPPFLAGS@
+CRAY_SWITCH_LDFLAGS = @CRAY_SWITCH_LDFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
diff --git a/src/database/Makefile.in b/src/database/Makefile.in
index d3d582e35245b1a9bf014582fcb573b372c5cdc1..5bdf6b199c4a6a52f6883fc60df32636079fc32a 100644
--- a/src/database/Makefile.in
+++ b/src/database/Makefile.in
@@ -190,6 +190,8 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CRAY_CPPFLAGS = @CRAY_CPPFLAGS@
CRAY_LDFLAGS = @CRAY_LDFLAGS@
+CRAY_SWITCH_CPPFLAGS = @CRAY_SWITCH_CPPFLAGS@
+CRAY_SWITCH_LDFLAGS = @CRAY_SWITCH_LDFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
diff --git a/src/db_api/Makefile.in b/src/db_api/Makefile.in
index 3cc57a55f999ca4cb9c7f0aa5fafe32c206577d6..83ba93cef02810597d36bdeb27be8f26086f18ec 100644
--- a/src/db_api/Makefile.in
+++ b/src/db_api/Makefile.in
@@ -205,6 +205,8 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CRAY_CPPFLAGS = @CRAY_CPPFLAGS@
CRAY_LDFLAGS = @CRAY_LDFLAGS@
+CRAY_SWITCH_CPPFLAGS = @CRAY_SWITCH_CPPFLAGS@
+CRAY_SWITCH_LDFLAGS = @CRAY_SWITCH_LDFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
diff --git a/src/plugins/Makefile.in b/src/plugins/Makefile.in
index be220ef64b308661c5b4160e53d1f812dc58825a..f00d19d41449bd77e1a3c157486b24b2c8878873 100644
--- a/src/plugins/Makefile.in
+++ b/src/plugins/Makefile.in
@@ -178,6 +178,8 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CRAY_CPPFLAGS = @CRAY_CPPFLAGS@
CRAY_LDFLAGS = @CRAY_LDFLAGS@
+CRAY_SWITCH_CPPFLAGS = @CRAY_SWITCH_CPPFLAGS@
+CRAY_SWITCH_LDFLAGS = @CRAY_SWITCH_LDFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
diff --git a/src/plugins/accounting_storage/Makefile.in b/src/plugins/accounting_storage/Makefile.in
index 54e5ac94a1b11aec9d537476637c56ec4ca1720a..140bf9757e52f115455a23e1743c749672c8c170 100644
--- a/src/plugins/accounting_storage/Makefile.in
+++ b/src/plugins/accounting_storage/Makefile.in
@@ -180,6 +180,8 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CRAY_CPPFLAGS = @CRAY_CPPFLAGS@
CRAY_LDFLAGS = @CRAY_LDFLAGS@
+CRAY_SWITCH_CPPFLAGS = @CRAY_SWITCH_CPPFLAGS@
+CRAY_SWITCH_LDFLAGS = @CRAY_SWITCH_LDFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
diff --git a/src/plugins/accounting_storage/common/Makefile.in b/src/plugins/accounting_storage/common/Makefile.in
index a6e14d319f00dc9a25e0cafa23c65042d5656b5f..47101bb75203d4cf8da7397753679188cca6d319 100644
--- a/src/plugins/accounting_storage/common/Makefile.in
+++ b/src/plugins/accounting_storage/common/Makefile.in
@@ -161,6 +161,8 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CRAY_CPPFLAGS = @CRAY_CPPFLAGS@
CRAY_LDFLAGS = @CRAY_LDFLAGS@
+CRAY_SWITCH_CPPFLAGS = @CRAY_SWITCH_CPPFLAGS@
+CRAY_SWITCH_LDFLAGS = @CRAY_SWITCH_LDFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
diff --git a/src/plugins/accounting_storage/filetxt/Makefile.in b/src/plugins/accounting_storage/filetxt/Makefile.in
index f7895e2c5cb4b010c8cda6c5ab301214652cdae4..c76936ebc6fa86a746b82d73bd160dbfbe39ce15 100644
--- a/src/plugins/accounting_storage/filetxt/Makefile.in
+++ b/src/plugins/accounting_storage/filetxt/Makefile.in
@@ -194,6 +194,8 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CRAY_CPPFLAGS = @CRAY_CPPFLAGS@
CRAY_LDFLAGS = @CRAY_LDFLAGS@
+CRAY_SWITCH_CPPFLAGS = @CRAY_SWITCH_CPPFLAGS@
+CRAY_SWITCH_LDFLAGS = @CRAY_SWITCH_LDFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
diff --git a/src/plugins/accounting_storage/mysql/Makefile.in b/src/plugins/accounting_storage/mysql/Makefile.in
index 5cd063fb5acfe2873219e2dda8dc2a2c5c5e4949..3f8d29f83573e92a2cb099a2cb4f1de0477f5f80 100644
--- a/src/plugins/accounting_storage/mysql/Makefile.in
+++ b/src/plugins/accounting_storage/mysql/Makefile.in
@@ -244,6 +244,8 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CRAY_CPPFLAGS = @CRAY_CPPFLAGS@
CRAY_LDFLAGS = @CRAY_LDFLAGS@
+CRAY_SWITCH_CPPFLAGS = @CRAY_SWITCH_CPPFLAGS@
+CRAY_SWITCH_LDFLAGS = @CRAY_SWITCH_LDFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
diff --git a/src/plugins/accounting_storage/none/Makefile.in b/src/plugins/accounting_storage/none/Makefile.in
index 678bc30d46a88b8db904bbdb7d457486e10deb0c..736ed04bad3a468ae11099a180af20165d253644 100644
--- a/src/plugins/accounting_storage/none/Makefile.in
+++ b/src/plugins/accounting_storage/none/Makefile.in
@@ -193,6 +193,8 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CRAY_CPPFLAGS = @CRAY_CPPFLAGS@
CRAY_LDFLAGS = @CRAY_LDFLAGS@
+CRAY_SWITCH_CPPFLAGS = @CRAY_SWITCH_CPPFLAGS@
+CRAY_SWITCH_LDFLAGS = @CRAY_SWITCH_LDFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
diff --git a/src/plugins/accounting_storage/pgsql/Makefile.in b/src/plugins/accounting_storage/pgsql/Makefile.in
index 746595f43b4b780c901dbb5ea7b0881ba32c71c0..296251a4b79ae3b7bdd364a969c9b7b56d53d416 100644
--- a/src/plugins/accounting_storage/pgsql/Makefile.in
+++ b/src/plugins/accounting_storage/pgsql/Makefile.in
@@ -239,6 +239,8 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CRAY_CPPFLAGS = @CRAY_CPPFLAGS@
CRAY_LDFLAGS = @CRAY_LDFLAGS@
+CRAY_SWITCH_CPPFLAGS = @CRAY_SWITCH_CPPFLAGS@
+CRAY_SWITCH_LDFLAGS = @CRAY_SWITCH_LDFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
diff --git a/src/plugins/accounting_storage/slurmdbd/Makefile.in b/src/plugins/accounting_storage/slurmdbd/Makefile.in
index 8df25c22466b813c3bd4d923ac816ed411726882..47b3caaea0837167d9887505779ba48b70cfb31f 100644
--- a/src/plugins/accounting_storage/slurmdbd/Makefile.in
+++ b/src/plugins/accounting_storage/slurmdbd/Makefile.in
@@ -194,6 +194,8 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CRAY_CPPFLAGS = @CRAY_CPPFLAGS@
CRAY_LDFLAGS = @CRAY_LDFLAGS@
+CRAY_SWITCH_CPPFLAGS = @CRAY_SWITCH_CPPFLAGS@
+CRAY_SWITCH_LDFLAGS = @CRAY_SWITCH_LDFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
diff --git a/src/plugins/acct_gather_energy/Makefile.in b/src/plugins/acct_gather_energy/Makefile.in
index 959a4717dc81815bbe2ce1346880afaa9f148699..67d120314fc83010b3378d63c7a3acb6aad74291 100644
--- a/src/plugins/acct_gather_energy/Makefile.in
+++ b/src/plugins/acct_gather_energy/Makefile.in
@@ -180,6 +180,8 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CRAY_CPPFLAGS = @CRAY_CPPFLAGS@
CRAY_LDFLAGS = @CRAY_LDFLAGS@
+CRAY_SWITCH_CPPFLAGS = @CRAY_SWITCH_CPPFLAGS@
+CRAY_SWITCH_LDFLAGS = @CRAY_SWITCH_LDFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
diff --git a/src/plugins/acct_gather_energy/ipmi/Makefile.in b/src/plugins/acct_gather_energy/ipmi/Makefile.in
index 9df6c8c04592b8e0f8b9d92a86b9592f3003e1b3..b978a7f40b76d75d6f753001305bcfd1b20acfa7 100644
--- a/src/plugins/acct_gather_energy/ipmi/Makefile.in
+++ b/src/plugins/acct_gather_energy/ipmi/Makefile.in
@@ -210,6 +210,8 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CRAY_CPPFLAGS = @CRAY_CPPFLAGS@
CRAY_LDFLAGS = @CRAY_LDFLAGS@
+CRAY_SWITCH_CPPFLAGS = @CRAY_SWITCH_CPPFLAGS@
+CRAY_SWITCH_LDFLAGS = @CRAY_SWITCH_LDFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
diff --git a/src/plugins/acct_gather_energy/none/Makefile.in b/src/plugins/acct_gather_energy/none/Makefile.in
index 6119c7696c9fcfa36939be1dae4a91bc04811c7a..901ff1aed6899972c76b750a9767b1ea41df9021 100644
--- a/src/plugins/acct_gather_energy/none/Makefile.in
+++ b/src/plugins/acct_gather_energy/none/Makefile.in
@@ -193,6 +193,8 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CRAY_CPPFLAGS = @CRAY_CPPFLAGS@
CRAY_LDFLAGS = @CRAY_LDFLAGS@
+CRAY_SWITCH_CPPFLAGS = @CRAY_SWITCH_CPPFLAGS@
+CRAY_SWITCH_LDFLAGS = @CRAY_SWITCH_LDFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
diff --git a/src/plugins/acct_gather_energy/rapl/Makefile.in b/src/plugins/acct_gather_energy/rapl/Makefile.in
index a287524a90b279ca1db15a3b54cde4c6e1d5ed43..def90327785c71a5d1c19f7199d9c626a52403c2 100644
--- a/src/plugins/acct_gather_energy/rapl/Makefile.in
+++ b/src/plugins/acct_gather_energy/rapl/Makefile.in
@@ -193,6 +193,8 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CRAY_CPPFLAGS = @CRAY_CPPFLAGS@
CRAY_LDFLAGS = @CRAY_LDFLAGS@
+CRAY_SWITCH_CPPFLAGS = @CRAY_SWITCH_CPPFLAGS@
+CRAY_SWITCH_LDFLAGS = @CRAY_SWITCH_LDFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
diff --git a/src/plugins/acct_gather_filesystem/Makefile.in b/src/plugins/acct_gather_filesystem/Makefile.in
index 4baebe8b3949f754bcf12f574c34f6a015afdcaa..d2f4a8d1f13d3560a8cf60ac3a4863e6566471ed 100644
--- a/src/plugins/acct_gather_filesystem/Makefile.in
+++ b/src/plugins/acct_gather_filesystem/Makefile.in
@@ -180,6 +180,8 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CRAY_CPPFLAGS = @CRAY_CPPFLAGS@
CRAY_LDFLAGS = @CRAY_LDFLAGS@
+CRAY_SWITCH_CPPFLAGS = @CRAY_SWITCH_CPPFLAGS@
+CRAY_SWITCH_LDFLAGS = @CRAY_SWITCH_LDFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
diff --git a/src/plugins/acct_gather_filesystem/lustre/Makefile.in b/src/plugins/acct_gather_filesystem/lustre/Makefile.in
index 9b9793239e1ceae31f9d230ac4f2a7869da6e29c..b0cbcec9ac13e01ac86dd8e087908839a59b3418 100644
--- a/src/plugins/acct_gather_filesystem/lustre/Makefile.in
+++ b/src/plugins/acct_gather_filesystem/lustre/Makefile.in
@@ -197,6 +197,8 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CRAY_CPPFLAGS = @CRAY_CPPFLAGS@
CRAY_LDFLAGS = @CRAY_LDFLAGS@
+CRAY_SWITCH_CPPFLAGS = @CRAY_SWITCH_CPPFLAGS@
+CRAY_SWITCH_LDFLAGS = @CRAY_SWITCH_LDFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
diff --git a/src/plugins/acct_gather_filesystem/none/Makefile.in b/src/plugins/acct_gather_filesystem/none/Makefile.in
index c2877d61b9f09adf00d363b39eaf0eb799f2d6b4..8d7f3bded86fd2ae89a5f515c6d0df96f558c4f1 100644
--- a/src/plugins/acct_gather_filesystem/none/Makefile.in
+++ b/src/plugins/acct_gather_filesystem/none/Makefile.in
@@ -194,6 +194,8 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CRAY_CPPFLAGS = @CRAY_CPPFLAGS@
CRAY_LDFLAGS = @CRAY_LDFLAGS@
+CRAY_SWITCH_CPPFLAGS = @CRAY_SWITCH_CPPFLAGS@
+CRAY_SWITCH_LDFLAGS = @CRAY_SWITCH_LDFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
diff --git a/src/plugins/acct_gather_infiniband/Makefile.in b/src/plugins/acct_gather_infiniband/Makefile.in
index 0b77def34a5e087ead6631a4929f64904f5ba1a8..82d62bea13be7fe506f12a9b371c1cb9519dd6d6 100644
--- a/src/plugins/acct_gather_infiniband/Makefile.in
+++ b/src/plugins/acct_gather_infiniband/Makefile.in
@@ -180,6 +180,8 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CRAY_CPPFLAGS = @CRAY_CPPFLAGS@
CRAY_LDFLAGS = @CRAY_LDFLAGS@
+CRAY_SWITCH_CPPFLAGS = @CRAY_SWITCH_CPPFLAGS@
+CRAY_SWITCH_LDFLAGS = @CRAY_SWITCH_LDFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
diff --git a/src/plugins/acct_gather_infiniband/none/Makefile.in b/src/plugins/acct_gather_infiniband/none/Makefile.in
index 95c1fb747313fcece204e6035b5a92c81d74b245..f123bcf1d17e4e1924d5481380c59379ebb6fa86 100644
--- a/src/plugins/acct_gather_infiniband/none/Makefile.in
+++ b/src/plugins/acct_gather_infiniband/none/Makefile.in
@@ -194,6 +194,8 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CRAY_CPPFLAGS = @CRAY_CPPFLAGS@
CRAY_LDFLAGS = @CRAY_LDFLAGS@
+CRAY_SWITCH_CPPFLAGS = @CRAY_SWITCH_CPPFLAGS@
+CRAY_SWITCH_LDFLAGS = @CRAY_SWITCH_LDFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
diff --git a/src/plugins/acct_gather_infiniband/ofed/Makefile.in b/src/plugins/acct_gather_infiniband/ofed/Makefile.in
index 9097f5c7900c20ddd29f6265c5778a9d57f23df7..2f9c1e8c48ce06eb01073a6ddca50ab5b261ba06 100644
--- a/src/plugins/acct_gather_infiniband/ofed/Makefile.in
+++ b/src/plugins/acct_gather_infiniband/ofed/Makefile.in
@@ -206,6 +206,8 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CRAY_CPPFLAGS = @CRAY_CPPFLAGS@
CRAY_LDFLAGS = @CRAY_LDFLAGS@
+CRAY_SWITCH_CPPFLAGS = @CRAY_SWITCH_CPPFLAGS@
+CRAY_SWITCH_LDFLAGS = @CRAY_SWITCH_LDFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
diff --git a/src/plugins/acct_gather_profile/Makefile.in b/src/plugins/acct_gather_profile/Makefile.in
index be0e971ddff81251c7b6ee28f9bd32688764d451..10ca032380cf6e350672c928c23c0bb668a62d4c 100644
--- a/src/plugins/acct_gather_profile/Makefile.in
+++ b/src/plugins/acct_gather_profile/Makefile.in
@@ -181,6 +181,8 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CRAY_CPPFLAGS = @CRAY_CPPFLAGS@
CRAY_LDFLAGS = @CRAY_LDFLAGS@
+CRAY_SWITCH_CPPFLAGS = @CRAY_SWITCH_CPPFLAGS@
+CRAY_SWITCH_LDFLAGS = @CRAY_SWITCH_LDFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
diff --git a/src/plugins/acct_gather_profile/hdf5/Makefile.in b/src/plugins/acct_gather_profile/hdf5/Makefile.in
index e2f945da60e6ba45331c45b637962ca33013ae86..943100f1c5d3a5c40caf775059be28e955315f43 100644
--- a/src/plugins/acct_gather_profile/hdf5/Makefile.in
+++ b/src/plugins/acct_gather_profile/hdf5/Makefile.in
@@ -256,6 +256,8 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CRAY_CPPFLAGS = @CRAY_CPPFLAGS@
CRAY_LDFLAGS = @CRAY_LDFLAGS@
+CRAY_SWITCH_CPPFLAGS = @CRAY_SWITCH_CPPFLAGS@
+CRAY_SWITCH_LDFLAGS = @CRAY_SWITCH_LDFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
diff --git a/src/plugins/acct_gather_profile/hdf5/sh5util/Makefile.in b/src/plugins/acct_gather_profile/hdf5/sh5util/Makefile.in
index 7c937af1903a0a8fb40cf36fe686f93ceefe25c8..9a244cc272384b7c952ed87e5e33af95ec5cff3d 100644
--- a/src/plugins/acct_gather_profile/hdf5/sh5util/Makefile.in
+++ b/src/plugins/acct_gather_profile/hdf5/sh5util/Makefile.in
@@ -173,6 +173,8 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CRAY_CPPFLAGS = @CRAY_CPPFLAGS@
CRAY_LDFLAGS = @CRAY_LDFLAGS@
+CRAY_SWITCH_CPPFLAGS = @CRAY_SWITCH_CPPFLAGS@
+CRAY_SWITCH_LDFLAGS = @CRAY_SWITCH_LDFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
diff --git a/src/plugins/acct_gather_profile/none/Makefile.in b/src/plugins/acct_gather_profile/none/Makefile.in
index 81eec65aecc77b8717375af8a52ebf9515a2517e..ae3ef2cfb6708da490be50143745b72ab9ac4633 100644
--- a/src/plugins/acct_gather_profile/none/Makefile.in
+++ b/src/plugins/acct_gather_profile/none/Makefile.in
@@ -193,6 +193,8 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CRAY_CPPFLAGS = @CRAY_CPPFLAGS@
CRAY_LDFLAGS = @CRAY_LDFLAGS@
+CRAY_SWITCH_CPPFLAGS = @CRAY_SWITCH_CPPFLAGS@
+CRAY_SWITCH_LDFLAGS = @CRAY_SWITCH_LDFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
diff --git a/src/plugins/auth/Makefile.in b/src/plugins/auth/Makefile.in
index 417ccf14fcc6f413871f2b946f604907ea4b3489..549acc156aa146511a4474ed53da2ab8c70e635f 100644
--- a/src/plugins/auth/Makefile.in
+++ b/src/plugins/auth/Makefile.in
@@ -180,6 +180,8 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CRAY_CPPFLAGS = @CRAY_CPPFLAGS@
CRAY_LDFLAGS = @CRAY_LDFLAGS@
+CRAY_SWITCH_CPPFLAGS = @CRAY_SWITCH_CPPFLAGS@
+CRAY_SWITCH_LDFLAGS = @CRAY_SWITCH_LDFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
diff --git a/src/plugins/auth/authd/Makefile.in b/src/plugins/auth/authd/Makefile.in
index 94c429be9d8c98f1d7a103ce77f0fc20745f45be..92529964dd2e38e2a2d6723c74081a24db2bdef3 100644
--- a/src/plugins/auth/authd/Makefile.in
+++ b/src/plugins/auth/authd/Makefile.in
@@ -192,6 +192,8 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CRAY_CPPFLAGS = @CRAY_CPPFLAGS@
CRAY_LDFLAGS = @CRAY_LDFLAGS@
+CRAY_SWITCH_CPPFLAGS = @CRAY_SWITCH_CPPFLAGS@
+CRAY_SWITCH_LDFLAGS = @CRAY_SWITCH_LDFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
diff --git a/src/plugins/auth/munge/Makefile.in b/src/plugins/auth/munge/Makefile.in
index 3cf16a4587f48c6a9c3719e454e36c5c361baa4f..eb146e93ec7e6cb965a9cd8a634e34b79958086b 100644
--- a/src/plugins/auth/munge/Makefile.in
+++ b/src/plugins/auth/munge/Makefile.in
@@ -193,6 +193,8 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CRAY_CPPFLAGS = @CRAY_CPPFLAGS@
CRAY_LDFLAGS = @CRAY_LDFLAGS@
+CRAY_SWITCH_CPPFLAGS = @CRAY_SWITCH_CPPFLAGS@
+CRAY_SWITCH_LDFLAGS = @CRAY_SWITCH_LDFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
diff --git a/src/plugins/auth/none/Makefile.in b/src/plugins/auth/none/Makefile.in
index f982eb726beee52a7ec6193955c20f2fb5051f3f..71c41d3e671fa249810bf2e92cea578a9a50e452 100644
--- a/src/plugins/auth/none/Makefile.in
+++ b/src/plugins/auth/none/Makefile.in
@@ -191,6 +191,8 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CRAY_CPPFLAGS = @CRAY_CPPFLAGS@
CRAY_LDFLAGS = @CRAY_LDFLAGS@
+CRAY_SWITCH_CPPFLAGS = @CRAY_SWITCH_CPPFLAGS@
+CRAY_SWITCH_LDFLAGS = @CRAY_SWITCH_LDFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
diff --git a/src/plugins/checkpoint/Makefile.in b/src/plugins/checkpoint/Makefile.in
index 92198f699cdb1d28b007ecbaf2f43752e3cc970c..3d8c20c418691e2215b83917e15d902c7ff4cfc5 100644
--- a/src/plugins/checkpoint/Makefile.in
+++ b/src/plugins/checkpoint/Makefile.in
@@ -180,6 +180,8 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CRAY_CPPFLAGS = @CRAY_CPPFLAGS@
CRAY_LDFLAGS = @CRAY_LDFLAGS@
+CRAY_SWITCH_CPPFLAGS = @CRAY_SWITCH_CPPFLAGS@
+CRAY_SWITCH_LDFLAGS = @CRAY_SWITCH_LDFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
diff --git a/src/plugins/checkpoint/aix/Makefile.in b/src/plugins/checkpoint/aix/Makefile.in
index 8639090fb4424b14102788d833bf6d19389c3469..73b4e61a16a838bf1022d8fcad0774f9b27679c8 100644
--- a/src/plugins/checkpoint/aix/Makefile.in
+++ b/src/plugins/checkpoint/aix/Makefile.in
@@ -196,6 +196,8 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CRAY_CPPFLAGS = @CRAY_CPPFLAGS@
CRAY_LDFLAGS = @CRAY_LDFLAGS@
+CRAY_SWITCH_CPPFLAGS = @CRAY_SWITCH_CPPFLAGS@
+CRAY_SWITCH_LDFLAGS = @CRAY_SWITCH_LDFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
diff --git a/src/plugins/checkpoint/blcr/Makefile.in b/src/plugins/checkpoint/blcr/Makefile.in
index ff7d21f6796bf9eb90967acf9929ef7573dd91a3..e65e3e927b8bc5f8bd8746a721d8d329740a5ae3 100644
--- a/src/plugins/checkpoint/blcr/Makefile.in
+++ b/src/plugins/checkpoint/blcr/Makefile.in
@@ -202,6 +202,8 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CRAY_CPPFLAGS = @CRAY_CPPFLAGS@
CRAY_LDFLAGS = @CRAY_LDFLAGS@
+CRAY_SWITCH_CPPFLAGS = @CRAY_SWITCH_CPPFLAGS@
+CRAY_SWITCH_LDFLAGS = @CRAY_SWITCH_LDFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
diff --git a/src/plugins/checkpoint/none/Makefile.in b/src/plugins/checkpoint/none/Makefile.in
index f758322192618685671f1c12f052b8a9ae6ef9eb..02e970efc0bd864ac6b5385e9bc115114a87750e 100644
--- a/src/plugins/checkpoint/none/Makefile.in
+++ b/src/plugins/checkpoint/none/Makefile.in
@@ -191,6 +191,8 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CRAY_CPPFLAGS = @CRAY_CPPFLAGS@
CRAY_LDFLAGS = @CRAY_LDFLAGS@
+CRAY_SWITCH_CPPFLAGS = @CRAY_SWITCH_CPPFLAGS@
+CRAY_SWITCH_LDFLAGS = @CRAY_SWITCH_LDFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
diff --git a/src/plugins/checkpoint/ompi/Makefile.in b/src/plugins/checkpoint/ompi/Makefile.in
index 7ad0a02aa4eb02660bdb7976f841e7c1582d3e90..80d3a008366bbefbbeddcb27c7c9afb01316a4c9 100644
--- a/src/plugins/checkpoint/ompi/Makefile.in
+++ b/src/plugins/checkpoint/ompi/Makefile.in
@@ -191,6 +191,8 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CRAY_CPPFLAGS = @CRAY_CPPFLAGS@
CRAY_LDFLAGS = @CRAY_LDFLAGS@
+CRAY_SWITCH_CPPFLAGS = @CRAY_SWITCH_CPPFLAGS@
+CRAY_SWITCH_LDFLAGS = @CRAY_SWITCH_LDFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
diff --git a/src/plugins/checkpoint/poe/Makefile.in b/src/plugins/checkpoint/poe/Makefile.in
index e1e6add81d19a9e53d913b0ae4216d1c273c4c23..b1cf6bd7458a570c555121bfe368b8ab5178628c 100644
--- a/src/plugins/checkpoint/poe/Makefile.in
+++ b/src/plugins/checkpoint/poe/Makefile.in
@@ -196,6 +196,8 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CRAY_CPPFLAGS = @CRAY_CPPFLAGS@
CRAY_LDFLAGS = @CRAY_LDFLAGS@
+CRAY_SWITCH_CPPFLAGS = @CRAY_SWITCH_CPPFLAGS@
+CRAY_SWITCH_LDFLAGS = @CRAY_SWITCH_LDFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
diff --git a/src/plugins/crypto/Makefile.in b/src/plugins/crypto/Makefile.in
index d1f73ac94aec783f2bfb9eaa749a71079328a251..e76bc87cfca5414625075f72d5f94d880a90a0e6 100644
--- a/src/plugins/crypto/Makefile.in
+++ b/src/plugins/crypto/Makefile.in
@@ -180,6 +180,8 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CRAY_CPPFLAGS = @CRAY_CPPFLAGS@
CRAY_LDFLAGS = @CRAY_LDFLAGS@
+CRAY_SWITCH_CPPFLAGS = @CRAY_SWITCH_CPPFLAGS@
+CRAY_SWITCH_LDFLAGS = @CRAY_SWITCH_LDFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
diff --git a/src/plugins/crypto/munge/Makefile.in b/src/plugins/crypto/munge/Makefile.in
index 343998f3a42e6f383faa365ba0bd602ce81f970c..4096ed3c84738dda60f885f427bc898213b4003b 100644
--- a/src/plugins/crypto/munge/Makefile.in
+++ b/src/plugins/crypto/munge/Makefile.in
@@ -193,6 +193,8 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CRAY_CPPFLAGS = @CRAY_CPPFLAGS@
CRAY_LDFLAGS = @CRAY_LDFLAGS@
+CRAY_SWITCH_CPPFLAGS = @CRAY_SWITCH_CPPFLAGS@
+CRAY_SWITCH_LDFLAGS = @CRAY_SWITCH_LDFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
diff --git a/src/plugins/crypto/openssl/Makefile.in b/src/plugins/crypto/openssl/Makefile.in
index 7a2120097ba9f39810ed6f53f6ee50671abe1035..5d5417d99bb3db8877bc6a3a522980190b6a24de 100644
--- a/src/plugins/crypto/openssl/Makefile.in
+++ b/src/plugins/crypto/openssl/Makefile.in
@@ -198,6 +198,8 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CRAY_CPPFLAGS = @CRAY_CPPFLAGS@
CRAY_LDFLAGS = @CRAY_LDFLAGS@
+CRAY_SWITCH_CPPFLAGS = @CRAY_SWITCH_CPPFLAGS@
+CRAY_SWITCH_LDFLAGS = @CRAY_SWITCH_LDFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
diff --git a/src/plugins/ext_sensors/Makefile.in b/src/plugins/ext_sensors/Makefile.in
index e87c279963baa9365f17e7383f2af7cf085dbb17..d4ad194a1bfae8ea2ae51c02b5675322803b0da9 100644
--- a/src/plugins/ext_sensors/Makefile.in
+++ b/src/plugins/ext_sensors/Makefile.in
@@ -180,6 +180,8 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CRAY_CPPFLAGS = @CRAY_CPPFLAGS@
CRAY_LDFLAGS = @CRAY_LDFLAGS@
+CRAY_SWITCH_CPPFLAGS = @CRAY_SWITCH_CPPFLAGS@
+CRAY_SWITCH_LDFLAGS = @CRAY_SWITCH_LDFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
diff --git a/src/plugins/ext_sensors/none/Makefile.in b/src/plugins/ext_sensors/none/Makefile.in
index adb7e68d3a44169c03cafb6949afd8a41f2c7f02..c6f737f5a93ce6bb7bd49bddb267d61646fc98cd 100644
--- a/src/plugins/ext_sensors/none/Makefile.in
+++ b/src/plugins/ext_sensors/none/Makefile.in
@@ -191,6 +191,8 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CRAY_CPPFLAGS = @CRAY_CPPFLAGS@
CRAY_LDFLAGS = @CRAY_LDFLAGS@
+CRAY_SWITCH_CPPFLAGS = @CRAY_SWITCH_CPPFLAGS@
+CRAY_SWITCH_LDFLAGS = @CRAY_SWITCH_LDFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
diff --git a/src/plugins/ext_sensors/rrd/Makefile.in b/src/plugins/ext_sensors/rrd/Makefile.in
index 5d029a842f9570667e51fd83c4c3537e2de1f6c7..6eabed7340904af3c205b1fea8dc655efcc3e391 100644
--- a/src/plugins/ext_sensors/rrd/Makefile.in
+++ b/src/plugins/ext_sensors/rrd/Makefile.in
@@ -200,6 +200,8 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CRAY_CPPFLAGS = @CRAY_CPPFLAGS@
CRAY_LDFLAGS = @CRAY_LDFLAGS@
+CRAY_SWITCH_CPPFLAGS = @CRAY_SWITCH_CPPFLAGS@
+CRAY_SWITCH_LDFLAGS = @CRAY_SWITCH_LDFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
diff --git a/src/plugins/gres/Makefile.in b/src/plugins/gres/Makefile.in
index 5d5f3bf391ace852804a802c49b47c143274907e..097c839575ca4b88114622ef885b2f838f09ee66 100644
--- a/src/plugins/gres/Makefile.in
+++ b/src/plugins/gres/Makefile.in
@@ -180,6 +180,8 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CRAY_CPPFLAGS = @CRAY_CPPFLAGS@
CRAY_LDFLAGS = @CRAY_LDFLAGS@
+CRAY_SWITCH_CPPFLAGS = @CRAY_SWITCH_CPPFLAGS@
+CRAY_SWITCH_LDFLAGS = @CRAY_SWITCH_LDFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
diff --git a/src/plugins/gres/gpu/Makefile.in b/src/plugins/gres/gpu/Makefile.in
index 73779c952f51397d4a4eed09afc626f9c4b429ec..f24475e4cb5fedcf5549ebfffab176acd735eeb1 100644
--- a/src/plugins/gres/gpu/Makefile.in
+++ b/src/plugins/gres/gpu/Makefile.in
@@ -192,6 +192,8 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CRAY_CPPFLAGS = @CRAY_CPPFLAGS@
CRAY_LDFLAGS = @CRAY_LDFLAGS@
+CRAY_SWITCH_CPPFLAGS = @CRAY_SWITCH_CPPFLAGS@
+CRAY_SWITCH_LDFLAGS = @CRAY_SWITCH_LDFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
diff --git a/src/plugins/gres/mic/Makefile.in b/src/plugins/gres/mic/Makefile.in
index 3d9871b9ec391c768291da76c9433f32f16ec246..a5988683155c25e47abbf075e082b1000e88696f 100644
--- a/src/plugins/gres/mic/Makefile.in
+++ b/src/plugins/gres/mic/Makefile.in
@@ -192,6 +192,8 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CRAY_CPPFLAGS = @CRAY_CPPFLAGS@
CRAY_LDFLAGS = @CRAY_LDFLAGS@
+CRAY_SWITCH_CPPFLAGS = @CRAY_SWITCH_CPPFLAGS@
+CRAY_SWITCH_LDFLAGS = @CRAY_SWITCH_LDFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
diff --git a/src/plugins/gres/nic/Makefile.in b/src/plugins/gres/nic/Makefile.in
index 203bb5a9c3fc0741106f800d70d3dea2fcb4394f..0cef8bace7dec2b5b36b82e11c6cc6cfb4d2e5cd 100644
--- a/src/plugins/gres/nic/Makefile.in
+++ b/src/plugins/gres/nic/Makefile.in
@@ -192,6 +192,8 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CRAY_CPPFLAGS = @CRAY_CPPFLAGS@
CRAY_LDFLAGS = @CRAY_LDFLAGS@
+CRAY_SWITCH_CPPFLAGS = @CRAY_SWITCH_CPPFLAGS@
+CRAY_SWITCH_LDFLAGS = @CRAY_SWITCH_LDFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
diff --git a/src/plugins/job_container/Makefile.in b/src/plugins/job_container/Makefile.in
index a5ab9050e6db99243ff8e59ec452ab69f470cfd4..c1f910fbbfba64567eb98fc38716dce14be7cd9c 100644
--- a/src/plugins/job_container/Makefile.in
+++ b/src/plugins/job_container/Makefile.in
@@ -180,6 +180,8 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CRAY_CPPFLAGS = @CRAY_CPPFLAGS@
CRAY_LDFLAGS = @CRAY_LDFLAGS@
+CRAY_SWITCH_CPPFLAGS = @CRAY_SWITCH_CPPFLAGS@
+CRAY_SWITCH_LDFLAGS = @CRAY_SWITCH_LDFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
diff --git a/src/plugins/job_container/cncu/Makefile.in b/src/plugins/job_container/cncu/Makefile.in
index 76a2e19a5fa0ab0d89db88705c81b21a266f63e6..64c479db44e37b1036bcdb7a96abf0846bba1ebe 100644
--- a/src/plugins/job_container/cncu/Makefile.in
+++ b/src/plugins/job_container/cncu/Makefile.in
@@ -191,6 +191,8 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CRAY_CPPFLAGS = @CRAY_CPPFLAGS@
CRAY_LDFLAGS = @CRAY_LDFLAGS@
+CRAY_SWITCH_CPPFLAGS = @CRAY_SWITCH_CPPFLAGS@
+CRAY_SWITCH_LDFLAGS = @CRAY_SWITCH_LDFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
diff --git a/src/plugins/job_container/none/Makefile.in b/src/plugins/job_container/none/Makefile.in
index 0317fff13414c57caadf4ca7d3b23a75ee5e87dc..9cb84bce12785b1a5181bf8d510122c1583ce717 100644
--- a/src/plugins/job_container/none/Makefile.in
+++ b/src/plugins/job_container/none/Makefile.in
@@ -192,6 +192,8 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CRAY_CPPFLAGS = @CRAY_CPPFLAGS@
CRAY_LDFLAGS = @CRAY_LDFLAGS@
+CRAY_SWITCH_CPPFLAGS = @CRAY_SWITCH_CPPFLAGS@
+CRAY_SWITCH_LDFLAGS = @CRAY_SWITCH_LDFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
diff --git a/src/plugins/job_submit/Makefile.in b/src/plugins/job_submit/Makefile.in
index 457bce95130e0316eb5af51e03f4de66fc98c35f..493283dabead2a2717e482ebfd00987617235e8b 100644
--- a/src/plugins/job_submit/Makefile.in
+++ b/src/plugins/job_submit/Makefile.in
@@ -180,6 +180,8 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CRAY_CPPFLAGS = @CRAY_CPPFLAGS@
CRAY_LDFLAGS = @CRAY_LDFLAGS@
+CRAY_SWITCH_CPPFLAGS = @CRAY_SWITCH_CPPFLAGS@
+CRAY_SWITCH_LDFLAGS = @CRAY_SWITCH_LDFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
diff --git a/src/plugins/job_submit/all_partitions/Makefile.in b/src/plugins/job_submit/all_partitions/Makefile.in
index c62a264131bba3d252a88a57e82737145668daa6..cc1611b323e726a495f69f508ea1c436cbb59a65 100644
--- a/src/plugins/job_submit/all_partitions/Makefile.in
+++ b/src/plugins/job_submit/all_partitions/Makefile.in
@@ -194,6 +194,8 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CRAY_CPPFLAGS = @CRAY_CPPFLAGS@
CRAY_LDFLAGS = @CRAY_LDFLAGS@
+CRAY_SWITCH_CPPFLAGS = @CRAY_SWITCH_CPPFLAGS@
+CRAY_SWITCH_LDFLAGS = @CRAY_SWITCH_LDFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
diff --git a/src/plugins/job_submit/cnode/Makefile.in b/src/plugins/job_submit/cnode/Makefile.in
index 8e4697edb2579a192f0e1a00511288f8bfed0de7..dd98265582d74a31ca85c9ae6ed91878b68b254c 100644
--- a/src/plugins/job_submit/cnode/Makefile.in
+++ b/src/plugins/job_submit/cnode/Makefile.in
@@ -191,6 +191,8 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CRAY_CPPFLAGS = @CRAY_CPPFLAGS@
CRAY_LDFLAGS = @CRAY_LDFLAGS@
+CRAY_SWITCH_CPPFLAGS = @CRAY_SWITCH_CPPFLAGS@
+CRAY_SWITCH_LDFLAGS = @CRAY_SWITCH_LDFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
diff --git a/src/plugins/job_submit/defaults/Makefile.in b/src/plugins/job_submit/defaults/Makefile.in
index be4d09b9e12458331823f86c135bd7606f44e9de..d234dc6f192e4c8e647580b8b95b7278448f069d 100644
--- a/src/plugins/job_submit/defaults/Makefile.in
+++ b/src/plugins/job_submit/defaults/Makefile.in
@@ -191,6 +191,8 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CRAY_CPPFLAGS = @CRAY_CPPFLAGS@
CRAY_LDFLAGS = @CRAY_LDFLAGS@
+CRAY_SWITCH_CPPFLAGS = @CRAY_SWITCH_CPPFLAGS@
+CRAY_SWITCH_LDFLAGS = @CRAY_SWITCH_LDFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
diff --git a/src/plugins/job_submit/logging/Makefile.in b/src/plugins/job_submit/logging/Makefile.in
index ab51a5237be113dd66e8f5c44b5ad46af966e99c..aa32408169e72d40415ea6a8fe2b7ad7d91742f4 100644
--- a/src/plugins/job_submit/logging/Makefile.in
+++ b/src/plugins/job_submit/logging/Makefile.in
@@ -191,6 +191,8 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CRAY_CPPFLAGS = @CRAY_CPPFLAGS@
CRAY_LDFLAGS = @CRAY_LDFLAGS@
+CRAY_SWITCH_CPPFLAGS = @CRAY_SWITCH_CPPFLAGS@
+CRAY_SWITCH_LDFLAGS = @CRAY_SWITCH_LDFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
diff --git a/src/plugins/job_submit/lua/Makefile.in b/src/plugins/job_submit/lua/Makefile.in
index c5a8c8fae6c674e8fbcf27461b36a5589d065544..2e0ea86879510c9f60603a17911f8cbb67831d67 100644
--- a/src/plugins/job_submit/lua/Makefile.in
+++ b/src/plugins/job_submit/lua/Makefile.in
@@ -196,6 +196,8 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CRAY_CPPFLAGS = @CRAY_CPPFLAGS@
CRAY_LDFLAGS = @CRAY_LDFLAGS@
+CRAY_SWITCH_CPPFLAGS = @CRAY_SWITCH_CPPFLAGS@
+CRAY_SWITCH_LDFLAGS = @CRAY_SWITCH_LDFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
diff --git a/src/plugins/job_submit/partition/Makefile.in b/src/plugins/job_submit/partition/Makefile.in
index 5062f79d33be83f012cfea8486a7861a02330b96..3f2acb65c78e4f2a0670b978b1e19bd88e64a2e6 100644
--- a/src/plugins/job_submit/partition/Makefile.in
+++ b/src/plugins/job_submit/partition/Makefile.in
@@ -192,6 +192,8 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CRAY_CPPFLAGS = @CRAY_CPPFLAGS@
CRAY_LDFLAGS = @CRAY_LDFLAGS@
+CRAY_SWITCH_CPPFLAGS = @CRAY_SWITCH_CPPFLAGS@
+CRAY_SWITCH_LDFLAGS = @CRAY_SWITCH_LDFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
diff --git a/src/plugins/job_submit/require_timelimit/Makefile.in b/src/plugins/job_submit/require_timelimit/Makefile.in
index 9e4c193817ad174af491d01fcb5d1de4614fbb15..d1aff4bbf4932a7d458be8ba7e321beadf397dad 100644
--- a/src/plugins/job_submit/require_timelimit/Makefile.in
+++ b/src/plugins/job_submit/require_timelimit/Makefile.in
@@ -194,6 +194,8 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CRAY_CPPFLAGS = @CRAY_CPPFLAGS@
CRAY_LDFLAGS = @CRAY_LDFLAGS@
+CRAY_SWITCH_CPPFLAGS = @CRAY_SWITCH_CPPFLAGS@
+CRAY_SWITCH_LDFLAGS = @CRAY_SWITCH_LDFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
diff --git a/src/plugins/jobacct_gather/Makefile.in b/src/plugins/jobacct_gather/Makefile.in
index 591773609aa7ddb7c7b6fe785422b3fbeffdc1f0..15e832287d157d7b0ba45fd92eed94cc17f84d26 100644
--- a/src/plugins/jobacct_gather/Makefile.in
+++ b/src/plugins/jobacct_gather/Makefile.in
@@ -180,6 +180,8 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CRAY_CPPFLAGS = @CRAY_CPPFLAGS@
CRAY_LDFLAGS = @CRAY_LDFLAGS@
+CRAY_SWITCH_CPPFLAGS = @CRAY_SWITCH_CPPFLAGS@
+CRAY_SWITCH_LDFLAGS = @CRAY_SWITCH_LDFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
diff --git a/src/plugins/jobacct_gather/aix/Makefile.in b/src/plugins/jobacct_gather/aix/Makefile.in
index f1487ba43615f2744bf7a611da810e19255a5e48..2a4e7209d3c3843086a5226c80d8b674b4e73447 100644
--- a/src/plugins/jobacct_gather/aix/Makefile.in
+++ b/src/plugins/jobacct_gather/aix/Makefile.in
@@ -191,6 +191,8 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CRAY_CPPFLAGS = @CRAY_CPPFLAGS@
CRAY_LDFLAGS = @CRAY_LDFLAGS@
+CRAY_SWITCH_CPPFLAGS = @CRAY_SWITCH_CPPFLAGS@
+CRAY_SWITCH_LDFLAGS = @CRAY_SWITCH_LDFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
diff --git a/src/plugins/jobacct_gather/cgroup/Makefile.in b/src/plugins/jobacct_gather/cgroup/Makefile.in
index 03036317fa45a7274669875689a658abede782d2..7d6ae38ce26c2a8e3d54499a320a981f0895738e 100644
--- a/src/plugins/jobacct_gather/cgroup/Makefile.in
+++ b/src/plugins/jobacct_gather/cgroup/Makefile.in
@@ -194,6 +194,8 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CRAY_CPPFLAGS = @CRAY_CPPFLAGS@
CRAY_LDFLAGS = @CRAY_LDFLAGS@
+CRAY_SWITCH_CPPFLAGS = @CRAY_SWITCH_CPPFLAGS@
+CRAY_SWITCH_LDFLAGS = @CRAY_SWITCH_LDFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
diff --git a/src/plugins/jobacct_gather/linux/Makefile.in b/src/plugins/jobacct_gather/linux/Makefile.in
index c85fb2a4448360ef9bdf39b402ca81604fd17738..8e67934a80a87be69b0c4bb8c0feeb2e56e82fa8 100644
--- a/src/plugins/jobacct_gather/linux/Makefile.in
+++ b/src/plugins/jobacct_gather/linux/Makefile.in
@@ -192,6 +192,8 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CRAY_CPPFLAGS = @CRAY_CPPFLAGS@
CRAY_LDFLAGS = @CRAY_LDFLAGS@
+CRAY_SWITCH_CPPFLAGS = @CRAY_SWITCH_CPPFLAGS@
+CRAY_SWITCH_LDFLAGS = @CRAY_SWITCH_LDFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
diff --git a/src/plugins/jobacct_gather/none/Makefile.in b/src/plugins/jobacct_gather/none/Makefile.in
index f807519979172e5dc95f47abdf9f5358a05c9b21..903d748e19499b183b558226a2f22251dde13bf4 100644
--- a/src/plugins/jobacct_gather/none/Makefile.in
+++ b/src/plugins/jobacct_gather/none/Makefile.in
@@ -191,6 +191,8 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CRAY_CPPFLAGS = @CRAY_CPPFLAGS@
CRAY_LDFLAGS = @CRAY_LDFLAGS@
+CRAY_SWITCH_CPPFLAGS = @CRAY_SWITCH_CPPFLAGS@
+CRAY_SWITCH_LDFLAGS = @CRAY_SWITCH_LDFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
diff --git a/src/plugins/jobcomp/Makefile.in b/src/plugins/jobcomp/Makefile.in
index 2ec814ab9a3abb7a177e5613d4957ef53a8d0c80..4e87fa95a20ff1209454467b53fbb9206cfcaf7b 100644
--- a/src/plugins/jobcomp/Makefile.in
+++ b/src/plugins/jobcomp/Makefile.in
@@ -180,6 +180,8 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CRAY_CPPFLAGS = @CRAY_CPPFLAGS@
CRAY_LDFLAGS = @CRAY_LDFLAGS@
+CRAY_SWITCH_CPPFLAGS = @CRAY_SWITCH_CPPFLAGS@
+CRAY_SWITCH_LDFLAGS = @CRAY_SWITCH_LDFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
diff --git a/src/plugins/jobcomp/filetxt/Makefile.in b/src/plugins/jobcomp/filetxt/Makefile.in
index 768581989dd13cff9c2d114dac0f43581a684d9d..ebdd8ef35c0efc99c83d841ba607bdb7ed6bf636 100644
--- a/src/plugins/jobcomp/filetxt/Makefile.in
+++ b/src/plugins/jobcomp/filetxt/Makefile.in
@@ -192,6 +192,8 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CRAY_CPPFLAGS = @CRAY_CPPFLAGS@
CRAY_LDFLAGS = @CRAY_LDFLAGS@
+CRAY_SWITCH_CPPFLAGS = @CRAY_SWITCH_CPPFLAGS@
+CRAY_SWITCH_LDFLAGS = @CRAY_SWITCH_LDFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
diff --git a/src/plugins/jobcomp/mysql/Makefile.in b/src/plugins/jobcomp/mysql/Makefile.in
index f6f87d41a53436f7f489f2437dfa2bf6c2a1f360..a1d3bf88bed39e6296c921f97154518c28bb5a7c 100644
--- a/src/plugins/jobcomp/mysql/Makefile.in
+++ b/src/plugins/jobcomp/mysql/Makefile.in
@@ -200,6 +200,8 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CRAY_CPPFLAGS = @CRAY_CPPFLAGS@
CRAY_LDFLAGS = @CRAY_LDFLAGS@
+CRAY_SWITCH_CPPFLAGS = @CRAY_SWITCH_CPPFLAGS@
+CRAY_SWITCH_LDFLAGS = @CRAY_SWITCH_LDFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
diff --git a/src/plugins/jobcomp/none/Makefile.in b/src/plugins/jobcomp/none/Makefile.in
index 51165dbbb5bcdef787b491e0c8c14d5d435743af..7ca2b34f8658cb55e509594f641c3a1ac151e05c 100644
--- a/src/plugins/jobcomp/none/Makefile.in
+++ b/src/plugins/jobcomp/none/Makefile.in
@@ -191,6 +191,8 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CRAY_CPPFLAGS = @CRAY_CPPFLAGS@
CRAY_LDFLAGS = @CRAY_LDFLAGS@
+CRAY_SWITCH_CPPFLAGS = @CRAY_SWITCH_CPPFLAGS@
+CRAY_SWITCH_LDFLAGS = @CRAY_SWITCH_LDFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
diff --git a/src/plugins/jobcomp/pgsql/Makefile.in b/src/plugins/jobcomp/pgsql/Makefile.in
index 7848e20734a1482006714c1820861718d49b2142..3ed545da01a3c65f3af47af0a45a07e2ac78cde8 100644
--- a/src/plugins/jobcomp/pgsql/Makefile.in
+++ b/src/plugins/jobcomp/pgsql/Makefile.in
@@ -200,6 +200,8 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CRAY_CPPFLAGS = @CRAY_CPPFLAGS@
CRAY_LDFLAGS = @CRAY_LDFLAGS@
+CRAY_SWITCH_CPPFLAGS = @CRAY_SWITCH_CPPFLAGS@
+CRAY_SWITCH_LDFLAGS = @CRAY_SWITCH_LDFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
diff --git a/src/plugins/jobcomp/script/Makefile.in b/src/plugins/jobcomp/script/Makefile.in
index 2976e3373acbad88a71ec6abab611a327ed5e3e0..b28293bb1e0ddc126271918a02f24899a3f617f1 100644
--- a/src/plugins/jobcomp/script/Makefile.in
+++ b/src/plugins/jobcomp/script/Makefile.in
@@ -191,6 +191,8 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CRAY_CPPFLAGS = @CRAY_CPPFLAGS@
CRAY_LDFLAGS = @CRAY_LDFLAGS@
+CRAY_SWITCH_CPPFLAGS = @CRAY_SWITCH_CPPFLAGS@
+CRAY_SWITCH_LDFLAGS = @CRAY_SWITCH_LDFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
diff --git a/src/plugins/launch/Makefile.in b/src/plugins/launch/Makefile.in
index 5c0458cb77d41564d236ee991de9f00341df1b33..4d99740853f0e9375f1360f3463d6f58f0c4794e 100644
--- a/src/plugins/launch/Makefile.in
+++ b/src/plugins/launch/Makefile.in
@@ -182,6 +182,8 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CRAY_CPPFLAGS = @CRAY_CPPFLAGS@
CRAY_LDFLAGS = @CRAY_LDFLAGS@
+CRAY_SWITCH_CPPFLAGS = @CRAY_SWITCH_CPPFLAGS@
+CRAY_SWITCH_LDFLAGS = @CRAY_SWITCH_LDFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
diff --git a/src/plugins/launch/aprun/Makefile.in b/src/plugins/launch/aprun/Makefile.in
index 502c7332c799c9a48c6ec4df5fdbd99a12d13df5..f4280a473fa14c0878847b19a6a4c7fbd4c55ce0 100644
--- a/src/plugins/launch/aprun/Makefile.in
+++ b/src/plugins/launch/aprun/Makefile.in
@@ -191,6 +191,8 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CRAY_CPPFLAGS = @CRAY_CPPFLAGS@
CRAY_LDFLAGS = @CRAY_LDFLAGS@
+CRAY_SWITCH_CPPFLAGS = @CRAY_SWITCH_CPPFLAGS@
+CRAY_SWITCH_LDFLAGS = @CRAY_SWITCH_LDFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
diff --git a/src/plugins/launch/poe/Makefile.in b/src/plugins/launch/poe/Makefile.in
index e00e2b309d0527f6931e5e2157cd7bc6996c789d..85c333a9fcfcb5a0808e20d4b0c480aff09cc81e 100644
--- a/src/plugins/launch/poe/Makefile.in
+++ b/src/plugins/launch/poe/Makefile.in
@@ -191,6 +191,8 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CRAY_CPPFLAGS = @CRAY_CPPFLAGS@
CRAY_LDFLAGS = @CRAY_LDFLAGS@
+CRAY_SWITCH_CPPFLAGS = @CRAY_SWITCH_CPPFLAGS@
+CRAY_SWITCH_LDFLAGS = @CRAY_SWITCH_LDFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
diff --git a/src/plugins/launch/runjob/Makefile.in b/src/plugins/launch/runjob/Makefile.in
index 327b3e05fa73f8cbe297c83655b2c08264649cb4..2b7c052d7748e55f41039b1dee262306977ee1e5 100644
--- a/src/plugins/launch/runjob/Makefile.in
+++ b/src/plugins/launch/runjob/Makefile.in
@@ -204,6 +204,8 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CRAY_CPPFLAGS = @CRAY_CPPFLAGS@
CRAY_LDFLAGS = @CRAY_LDFLAGS@
+CRAY_SWITCH_CPPFLAGS = @CRAY_SWITCH_CPPFLAGS@
+CRAY_SWITCH_LDFLAGS = @CRAY_SWITCH_LDFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
diff --git a/src/plugins/launch/slurm/Makefile.in b/src/plugins/launch/slurm/Makefile.in
index 0980f28278da1b4fdf012b928eff7a75688b19b0..8330fcc4790e9b5cf52f8736946865da8627b0c0 100644
--- a/src/plugins/launch/slurm/Makefile.in
+++ b/src/plugins/launch/slurm/Makefile.in
@@ -191,6 +191,8 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CRAY_CPPFLAGS = @CRAY_CPPFLAGS@
CRAY_LDFLAGS = @CRAY_LDFLAGS@
+CRAY_SWITCH_CPPFLAGS = @CRAY_SWITCH_CPPFLAGS@
+CRAY_SWITCH_LDFLAGS = @CRAY_SWITCH_LDFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
diff --git a/src/plugins/mpi/Makefile.in b/src/plugins/mpi/Makefile.in
index 4af18ac6d62d81d1a38bf64dbbcea17a2ad42198..ede5e5918135f52222a53cd0ad85a0dff8b96c96 100644
--- a/src/plugins/mpi/Makefile.in
+++ b/src/plugins/mpi/Makefile.in
@@ -181,6 +181,8 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CRAY_CPPFLAGS = @CRAY_CPPFLAGS@
CRAY_LDFLAGS = @CRAY_LDFLAGS@
+CRAY_SWITCH_CPPFLAGS = @CRAY_SWITCH_CPPFLAGS@
+CRAY_SWITCH_LDFLAGS = @CRAY_SWITCH_LDFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
diff --git a/src/plugins/mpi/lam/Makefile.in b/src/plugins/mpi/lam/Makefile.in
index b25ee3ea4d583c6db9bb18ffdc814b315a009005..1feb235ef1acdc11f2b90b027064253bf8f7739f 100644
--- a/src/plugins/mpi/lam/Makefile.in
+++ b/src/plugins/mpi/lam/Makefile.in
@@ -191,6 +191,8 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CRAY_CPPFLAGS = @CRAY_CPPFLAGS@
CRAY_LDFLAGS = @CRAY_LDFLAGS@
+CRAY_SWITCH_CPPFLAGS = @CRAY_SWITCH_CPPFLAGS@
+CRAY_SWITCH_LDFLAGS = @CRAY_SWITCH_LDFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
diff --git a/src/plugins/mpi/mpich1_p4/Makefile.in b/src/plugins/mpi/mpich1_p4/Makefile.in
index 69f74c4b3a597de71c459c9ba197a43cf8f3a81f..1d4322d30a35aa3332188cef007c58c59984070b 100644
--- a/src/plugins/mpi/mpich1_p4/Makefile.in
+++ b/src/plugins/mpi/mpich1_p4/Makefile.in
@@ -191,6 +191,8 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CRAY_CPPFLAGS = @CRAY_CPPFLAGS@
CRAY_LDFLAGS = @CRAY_LDFLAGS@
+CRAY_SWITCH_CPPFLAGS = @CRAY_SWITCH_CPPFLAGS@
+CRAY_SWITCH_LDFLAGS = @CRAY_SWITCH_LDFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
diff --git a/src/plugins/mpi/mpich1_shmem/Makefile.in b/src/plugins/mpi/mpich1_shmem/Makefile.in
index 7faac9845152da78f32a4f1f447b46adaa658981..e6cba0b44c6ae1c27c1c863ee7633f27724e4709 100644
--- a/src/plugins/mpi/mpich1_shmem/Makefile.in
+++ b/src/plugins/mpi/mpich1_shmem/Makefile.in
@@ -191,6 +191,8 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CRAY_CPPFLAGS = @CRAY_CPPFLAGS@
CRAY_LDFLAGS = @CRAY_LDFLAGS@
+CRAY_SWITCH_CPPFLAGS = @CRAY_SWITCH_CPPFLAGS@
+CRAY_SWITCH_LDFLAGS = @CRAY_SWITCH_LDFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
diff --git a/src/plugins/mpi/mpichgm/Makefile.in b/src/plugins/mpi/mpichgm/Makefile.in
index e679bf87e2e465d13a46a7ff143389c369644fc9..f3a7290fd0bea8dc1f20fa944eb5910f6109af2c 100644
--- a/src/plugins/mpi/mpichgm/Makefile.in
+++ b/src/plugins/mpi/mpichgm/Makefile.in
@@ -191,6 +191,8 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CRAY_CPPFLAGS = @CRAY_CPPFLAGS@
CRAY_LDFLAGS = @CRAY_LDFLAGS@
+CRAY_SWITCH_CPPFLAGS = @CRAY_SWITCH_CPPFLAGS@
+CRAY_SWITCH_LDFLAGS = @CRAY_SWITCH_LDFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
diff --git a/src/plugins/mpi/mpichmx/Makefile.in b/src/plugins/mpi/mpichmx/Makefile.in
index ddc8d4df879b25b006e90853b991912a26d8576f..89d81df81e85334037233a4a935399b7f3c6d83c 100644
--- a/src/plugins/mpi/mpichmx/Makefile.in
+++ b/src/plugins/mpi/mpichmx/Makefile.in
@@ -191,6 +191,8 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CRAY_CPPFLAGS = @CRAY_CPPFLAGS@
CRAY_LDFLAGS = @CRAY_LDFLAGS@
+CRAY_SWITCH_CPPFLAGS = @CRAY_SWITCH_CPPFLAGS@
+CRAY_SWITCH_LDFLAGS = @CRAY_SWITCH_LDFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
diff --git a/src/plugins/mpi/mvapich/Makefile.in b/src/plugins/mpi/mvapich/Makefile.in
index a8f8987cd48f8ae0ddd61dd7e1625c217ccef533..45e927353c0dd2c8830d3ffe7a32c89a79f78a5f 100644
--- a/src/plugins/mpi/mvapich/Makefile.in
+++ b/src/plugins/mpi/mvapich/Makefile.in
@@ -191,6 +191,8 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CRAY_CPPFLAGS = @CRAY_CPPFLAGS@
CRAY_LDFLAGS = @CRAY_LDFLAGS@
+CRAY_SWITCH_CPPFLAGS = @CRAY_SWITCH_CPPFLAGS@
+CRAY_SWITCH_LDFLAGS = @CRAY_SWITCH_LDFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
diff --git a/src/plugins/mpi/none/Makefile.in b/src/plugins/mpi/none/Makefile.in
index f093ca7e3cdbb3e379774fd53e3a0730e76b9c68..0911d0eda91d58ad468ef8461a58d420b3c05101 100644
--- a/src/plugins/mpi/none/Makefile.in
+++ b/src/plugins/mpi/none/Makefile.in
@@ -191,6 +191,8 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CRAY_CPPFLAGS = @CRAY_CPPFLAGS@
CRAY_LDFLAGS = @CRAY_LDFLAGS@
+CRAY_SWITCH_CPPFLAGS = @CRAY_SWITCH_CPPFLAGS@
+CRAY_SWITCH_LDFLAGS = @CRAY_SWITCH_LDFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
diff --git a/src/plugins/mpi/openmpi/Makefile.in b/src/plugins/mpi/openmpi/Makefile.in
index 61877007fa6fe3c5320566932ea25eb7f3b80779..5f04f6d5a8343d91770db5e8b51538e58f6da488 100644
--- a/src/plugins/mpi/openmpi/Makefile.in
+++ b/src/plugins/mpi/openmpi/Makefile.in
@@ -191,6 +191,8 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CRAY_CPPFLAGS = @CRAY_CPPFLAGS@
CRAY_LDFLAGS = @CRAY_LDFLAGS@
+CRAY_SWITCH_CPPFLAGS = @CRAY_SWITCH_CPPFLAGS@
+CRAY_SWITCH_LDFLAGS = @CRAY_SWITCH_LDFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
diff --git a/src/plugins/mpi/pmi2/Makefile.in b/src/plugins/mpi/pmi2/Makefile.in
index 433474c18fc58eb8985ede4c186b9bcbc8cd8eed..007bee0f94c85b89ed9e9649369264e962fbfe44 100644
--- a/src/plugins/mpi/pmi2/Makefile.in
+++ b/src/plugins/mpi/pmi2/Makefile.in
@@ -193,6 +193,8 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CRAY_CPPFLAGS = @CRAY_CPPFLAGS@
CRAY_LDFLAGS = @CRAY_LDFLAGS@
+CRAY_SWITCH_CPPFLAGS = @CRAY_SWITCH_CPPFLAGS@
+CRAY_SWITCH_LDFLAGS = @CRAY_SWITCH_LDFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
diff --git a/src/plugins/preempt/Makefile.in b/src/plugins/preempt/Makefile.in
index 6d3939caa63f0f52902a3695521c02dbcd805e5d..09b1ac783f07dac2fe7874d7eb99b4d3267e6cb7 100644
--- a/src/plugins/preempt/Makefile.in
+++ b/src/plugins/preempt/Makefile.in
@@ -180,6 +180,8 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CRAY_CPPFLAGS = @CRAY_CPPFLAGS@
CRAY_LDFLAGS = @CRAY_LDFLAGS@
+CRAY_SWITCH_CPPFLAGS = @CRAY_SWITCH_CPPFLAGS@
+CRAY_SWITCH_LDFLAGS = @CRAY_SWITCH_LDFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
diff --git a/src/plugins/preempt/none/Makefile.in b/src/plugins/preempt/none/Makefile.in
index c63d98ea959734ea83adce0f860e7bc0c41aa7f0..cf54c3a217c8dc4a86404c9df79d7dd783a909ea 100644
--- a/src/plugins/preempt/none/Makefile.in
+++ b/src/plugins/preempt/none/Makefile.in
@@ -191,6 +191,8 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CRAY_CPPFLAGS = @CRAY_CPPFLAGS@
CRAY_LDFLAGS = @CRAY_LDFLAGS@
+CRAY_SWITCH_CPPFLAGS = @CRAY_SWITCH_CPPFLAGS@
+CRAY_SWITCH_LDFLAGS = @CRAY_SWITCH_LDFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
diff --git a/src/plugins/preempt/partition_prio/Makefile.in b/src/plugins/preempt/partition_prio/Makefile.in
index 8580e0c42e13a4b89ce07fd8659d904c62b9acce..2e06f3de0c0e046ed9aa7b8e7cb432d6ef2e2c95 100644
--- a/src/plugins/preempt/partition_prio/Makefile.in
+++ b/src/plugins/preempt/partition_prio/Makefile.in
@@ -193,6 +193,8 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CRAY_CPPFLAGS = @CRAY_CPPFLAGS@
CRAY_LDFLAGS = @CRAY_LDFLAGS@
+CRAY_SWITCH_CPPFLAGS = @CRAY_SWITCH_CPPFLAGS@
+CRAY_SWITCH_LDFLAGS = @CRAY_SWITCH_LDFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
diff --git a/src/plugins/preempt/qos/Makefile.in b/src/plugins/preempt/qos/Makefile.in
index 8d6f72fca575797ebfdfc79d575c3a400725d23b..a8cfea6172110318b3a07924997930619d62f201 100644
--- a/src/plugins/preempt/qos/Makefile.in
+++ b/src/plugins/preempt/qos/Makefile.in
@@ -191,6 +191,8 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CRAY_CPPFLAGS = @CRAY_CPPFLAGS@
CRAY_LDFLAGS = @CRAY_LDFLAGS@
+CRAY_SWITCH_CPPFLAGS = @CRAY_SWITCH_CPPFLAGS@
+CRAY_SWITCH_LDFLAGS = @CRAY_SWITCH_LDFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
diff --git a/src/plugins/priority/Makefile.in b/src/plugins/priority/Makefile.in
index c1f75714872ae402137510aac2b27446ebcabd94..cdbf9b3c9b59efceba1795c123637c157bca87ca 100644
--- a/src/plugins/priority/Makefile.in
+++ b/src/plugins/priority/Makefile.in
@@ -178,6 +178,8 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CRAY_CPPFLAGS = @CRAY_CPPFLAGS@
CRAY_LDFLAGS = @CRAY_LDFLAGS@
+CRAY_SWITCH_CPPFLAGS = @CRAY_SWITCH_CPPFLAGS@
+CRAY_SWITCH_LDFLAGS = @CRAY_SWITCH_LDFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
diff --git a/src/plugins/priority/basic/Makefile.in b/src/plugins/priority/basic/Makefile.in
index 15b123b85a50c88567f71eb9619aa90e8bc89146..6b2ddc3a76fb9709bab6243b3f31aacea6d9801b 100644
--- a/src/plugins/priority/basic/Makefile.in
+++ b/src/plugins/priority/basic/Makefile.in
@@ -191,6 +191,8 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CRAY_CPPFLAGS = @CRAY_CPPFLAGS@
CRAY_LDFLAGS = @CRAY_LDFLAGS@
+CRAY_SWITCH_CPPFLAGS = @CRAY_SWITCH_CPPFLAGS@
+CRAY_SWITCH_LDFLAGS = @CRAY_SWITCH_LDFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
diff --git a/src/plugins/priority/multifactor/Makefile.in b/src/plugins/priority/multifactor/Makefile.in
index f1485f3eafb0e7f05b9006444f5ab4b197877a1a..fb8799aa0a6bf5482c263ee849f902707b8a61d0 100644
--- a/src/plugins/priority/multifactor/Makefile.in
+++ b/src/plugins/priority/multifactor/Makefile.in
@@ -192,6 +192,8 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CRAY_CPPFLAGS = @CRAY_CPPFLAGS@
CRAY_LDFLAGS = @CRAY_LDFLAGS@
+CRAY_SWITCH_CPPFLAGS = @CRAY_SWITCH_CPPFLAGS@
+CRAY_SWITCH_LDFLAGS = @CRAY_SWITCH_LDFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
diff --git a/src/plugins/proctrack/Makefile.in b/src/plugins/proctrack/Makefile.in
index 3295b3e90a7b5695d51d99f651797e14fb21f64b..885d55d9b612e3bc51e91e05d38cb0db421ec786 100644
--- a/src/plugins/proctrack/Makefile.in
+++ b/src/plugins/proctrack/Makefile.in
@@ -180,6 +180,8 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CRAY_CPPFLAGS = @CRAY_CPPFLAGS@
CRAY_LDFLAGS = @CRAY_LDFLAGS@
+CRAY_SWITCH_CPPFLAGS = @CRAY_SWITCH_CPPFLAGS@
+CRAY_SWITCH_LDFLAGS = @CRAY_SWITCH_LDFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
diff --git a/src/plugins/proctrack/aix/Makefile.in b/src/plugins/proctrack/aix/Makefile.in
index f4fca689dd32560bf6cb62670aebad20c8ff948b..ab20a9096a16a3bc994546cf7d0a8b8b48a6ceb6 100644
--- a/src/plugins/proctrack/aix/Makefile.in
+++ b/src/plugins/proctrack/aix/Makefile.in
@@ -191,6 +191,8 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CRAY_CPPFLAGS = @CRAY_CPPFLAGS@
CRAY_LDFLAGS = @CRAY_LDFLAGS@
+CRAY_SWITCH_CPPFLAGS = @CRAY_SWITCH_CPPFLAGS@
+CRAY_SWITCH_LDFLAGS = @CRAY_SWITCH_LDFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
diff --git a/src/plugins/proctrack/cgroup/Makefile.in b/src/plugins/proctrack/cgroup/Makefile.in
index d61b4896e11689df9b08c680ca2090a9bbddfcd4..5e401c6ed62619f52d5486ee62798019ffa05225 100644
--- a/src/plugins/proctrack/cgroup/Makefile.in
+++ b/src/plugins/proctrack/cgroup/Makefile.in
@@ -191,6 +191,8 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CRAY_CPPFLAGS = @CRAY_CPPFLAGS@
CRAY_LDFLAGS = @CRAY_LDFLAGS@
+CRAY_SWITCH_CPPFLAGS = @CRAY_SWITCH_CPPFLAGS@
+CRAY_SWITCH_LDFLAGS = @CRAY_SWITCH_LDFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
diff --git a/src/plugins/proctrack/cray/Makefile.in b/src/plugins/proctrack/cray/Makefile.in
index 9cd8948777ccd9cf467516587bd4cef38d6ceabc..ac653771df11c100de4f081d5f0e59d78c45233b 100644
--- a/src/plugins/proctrack/cray/Makefile.in
+++ b/src/plugins/proctrack/cray/Makefile.in
@@ -192,6 +192,8 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CRAY_CPPFLAGS = @CRAY_CPPFLAGS@
CRAY_LDFLAGS = @CRAY_LDFLAGS@
+CRAY_SWITCH_CPPFLAGS = @CRAY_SWITCH_CPPFLAGS@
+CRAY_SWITCH_LDFLAGS = @CRAY_SWITCH_LDFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
diff --git a/src/plugins/proctrack/linuxproc/Makefile.in b/src/plugins/proctrack/linuxproc/Makefile.in
index e746c3c2e62fa90e8d6f48d6e3ed6456f4e71cfd..42a02be79c3e5b32b8972d090b6f5e6febc6b3e0 100644
--- a/src/plugins/proctrack/linuxproc/Makefile.in
+++ b/src/plugins/proctrack/linuxproc/Makefile.in
@@ -192,6 +192,8 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CRAY_CPPFLAGS = @CRAY_CPPFLAGS@
CRAY_LDFLAGS = @CRAY_LDFLAGS@
+CRAY_SWITCH_CPPFLAGS = @CRAY_SWITCH_CPPFLAGS@
+CRAY_SWITCH_LDFLAGS = @CRAY_SWITCH_LDFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
diff --git a/src/plugins/proctrack/lua/Makefile.in b/src/plugins/proctrack/lua/Makefile.in
index 1c44a7840403e9555a87c3f1c2849d8983d7f2cb..6c9537d37e6cbb321103be7fc1dde72b0ff19f47 100644
--- a/src/plugins/proctrack/lua/Makefile.in
+++ b/src/plugins/proctrack/lua/Makefile.in
@@ -191,6 +191,8 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CRAY_CPPFLAGS = @CRAY_CPPFLAGS@
CRAY_LDFLAGS = @CRAY_LDFLAGS@
+CRAY_SWITCH_CPPFLAGS = @CRAY_SWITCH_CPPFLAGS@
+CRAY_SWITCH_LDFLAGS = @CRAY_SWITCH_LDFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
diff --git a/src/plugins/proctrack/pgid/Makefile.in b/src/plugins/proctrack/pgid/Makefile.in
index c4a0639800f79d4e2ad1fc7d8fe56d14cf44337a..9603cd832d5695989c8462780038bc3249c73afd 100644
--- a/src/plugins/proctrack/pgid/Makefile.in
+++ b/src/plugins/proctrack/pgid/Makefile.in
@@ -191,6 +191,8 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CRAY_CPPFLAGS = @CRAY_CPPFLAGS@
CRAY_LDFLAGS = @CRAY_LDFLAGS@
+CRAY_SWITCH_CPPFLAGS = @CRAY_SWITCH_CPPFLAGS@
+CRAY_SWITCH_LDFLAGS = @CRAY_SWITCH_LDFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
diff --git a/src/plugins/proctrack/sgi_job/Makefile.in b/src/plugins/proctrack/sgi_job/Makefile.in
index 212caca07e07167da9a9b8914f79e1f10c4026bf..0c3efcd3d5fad9648fac0825470673b1cba66953 100644
--- a/src/plugins/proctrack/sgi_job/Makefile.in
+++ b/src/plugins/proctrack/sgi_job/Makefile.in
@@ -191,6 +191,8 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CRAY_CPPFLAGS = @CRAY_CPPFLAGS@
CRAY_LDFLAGS = @CRAY_LDFLAGS@
+CRAY_SWITCH_CPPFLAGS = @CRAY_SWITCH_CPPFLAGS@
+CRAY_SWITCH_LDFLAGS = @CRAY_SWITCH_LDFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
diff --git a/src/plugins/sched/Makefile.in b/src/plugins/sched/Makefile.in
index 62deb89ebaf009276c5d2bd4adbdcd4261942d9d..5eabceb956ae404eb3a1b33884170ce650c10d37 100644
--- a/src/plugins/sched/Makefile.in
+++ b/src/plugins/sched/Makefile.in
@@ -180,6 +180,8 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CRAY_CPPFLAGS = @CRAY_CPPFLAGS@
CRAY_LDFLAGS = @CRAY_LDFLAGS@
+CRAY_SWITCH_CPPFLAGS = @CRAY_SWITCH_CPPFLAGS@
+CRAY_SWITCH_LDFLAGS = @CRAY_SWITCH_LDFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
diff --git a/src/plugins/sched/backfill/Makefile.in b/src/plugins/sched/backfill/Makefile.in
index 0f961477bad07b1ded5e02f1ba826e6003007d52..81602916092a9a132c384afb6d71fa2cbd572cc8 100644
--- a/src/plugins/sched/backfill/Makefile.in
+++ b/src/plugins/sched/backfill/Makefile.in
@@ -191,6 +191,8 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CRAY_CPPFLAGS = @CRAY_CPPFLAGS@
CRAY_LDFLAGS = @CRAY_LDFLAGS@
+CRAY_SWITCH_CPPFLAGS = @CRAY_SWITCH_CPPFLAGS@
+CRAY_SWITCH_LDFLAGS = @CRAY_SWITCH_LDFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
diff --git a/src/plugins/sched/builtin/Makefile.in b/src/plugins/sched/builtin/Makefile.in
index 2b9b183e27e0b385b1028051e8c3abdccedc9481..3a6afc4a6ebaad24c9c0cd3ab65e20466e1e63a4 100644
--- a/src/plugins/sched/builtin/Makefile.in
+++ b/src/plugins/sched/builtin/Makefile.in
@@ -191,6 +191,8 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CRAY_CPPFLAGS = @CRAY_CPPFLAGS@
CRAY_LDFLAGS = @CRAY_LDFLAGS@
+CRAY_SWITCH_CPPFLAGS = @CRAY_SWITCH_CPPFLAGS@
+CRAY_SWITCH_LDFLAGS = @CRAY_SWITCH_LDFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
diff --git a/src/plugins/sched/hold/Makefile.in b/src/plugins/sched/hold/Makefile.in
index a8640d6e5298ff3abf3e33edea4d6dd2687265ce..f230be92080eddd0132ddf7d9ecfa0d36360f129 100644
--- a/src/plugins/sched/hold/Makefile.in
+++ b/src/plugins/sched/hold/Makefile.in
@@ -191,6 +191,8 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CRAY_CPPFLAGS = @CRAY_CPPFLAGS@
CRAY_LDFLAGS = @CRAY_LDFLAGS@
+CRAY_SWITCH_CPPFLAGS = @CRAY_SWITCH_CPPFLAGS@
+CRAY_SWITCH_LDFLAGS = @CRAY_SWITCH_LDFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
diff --git a/src/plugins/sched/wiki/Makefile.in b/src/plugins/sched/wiki/Makefile.in
index 3a492669e4534d64c207338a65140b446b3678cf..80081aadedd9e566de3d949a7ffc9e8f6af75ad2 100644
--- a/src/plugins/sched/wiki/Makefile.in
+++ b/src/plugins/sched/wiki/Makefile.in
@@ -193,6 +193,8 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CRAY_CPPFLAGS = @CRAY_CPPFLAGS@
CRAY_LDFLAGS = @CRAY_LDFLAGS@
+CRAY_SWITCH_CPPFLAGS = @CRAY_SWITCH_CPPFLAGS@
+CRAY_SWITCH_LDFLAGS = @CRAY_SWITCH_LDFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
diff --git a/src/plugins/sched/wiki2/Makefile.in b/src/plugins/sched/wiki2/Makefile.in
index 56d1c0b7e9170f5c84e911465226fc3c588e3574..5a6eb72d888d94fe1922cc7a63d7f57d820590cc 100644
--- a/src/plugins/sched/wiki2/Makefile.in
+++ b/src/plugins/sched/wiki2/Makefile.in
@@ -196,6 +196,8 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CRAY_CPPFLAGS = @CRAY_CPPFLAGS@
CRAY_LDFLAGS = @CRAY_LDFLAGS@
+CRAY_SWITCH_CPPFLAGS = @CRAY_SWITCH_CPPFLAGS@
+CRAY_SWITCH_LDFLAGS = @CRAY_SWITCH_LDFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
diff --git a/src/plugins/select/Makefile.in b/src/plugins/select/Makefile.in
index c7bf3c1d2cf7a02a1cd69d0c0ef8e5c5a95d01cf..aef3327c830fbc98ec517faf48835147055eddad 100644
--- a/src/plugins/select/Makefile.in
+++ b/src/plugins/select/Makefile.in
@@ -180,6 +180,8 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CRAY_CPPFLAGS = @CRAY_CPPFLAGS@
CRAY_LDFLAGS = @CRAY_LDFLAGS@
+CRAY_SWITCH_CPPFLAGS = @CRAY_SWITCH_CPPFLAGS@
+CRAY_SWITCH_LDFLAGS = @CRAY_SWITCH_LDFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
diff --git a/src/plugins/select/alps/Makefile.in b/src/plugins/select/alps/Makefile.in
index 6719da894213cb735f58817182f1eaef8b60beb9..87fddbae22727fa173f7027f184faac769937c34 100644
--- a/src/plugins/select/alps/Makefile.in
+++ b/src/plugins/select/alps/Makefile.in
@@ -241,6 +241,8 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CRAY_CPPFLAGS = @CRAY_CPPFLAGS@
CRAY_LDFLAGS = @CRAY_LDFLAGS@
+CRAY_SWITCH_CPPFLAGS = @CRAY_SWITCH_CPPFLAGS@
+CRAY_SWITCH_LDFLAGS = @CRAY_SWITCH_LDFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
diff --git a/src/plugins/select/alps/libalps/Makefile.in b/src/plugins/select/alps/libalps/Makefile.in
index bd79a75dd0b0b09c000bfb46fdd67c40ac095ca8..340cc6462024e46d89f01a115fd03cecf70d014e 100644
--- a/src/plugins/select/alps/libalps/Makefile.in
+++ b/src/plugins/select/alps/libalps/Makefile.in
@@ -172,6 +172,8 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CRAY_CPPFLAGS = @CRAY_CPPFLAGS@
CRAY_LDFLAGS = @CRAY_LDFLAGS@
+CRAY_SWITCH_CPPFLAGS = @CRAY_SWITCH_CPPFLAGS@
+CRAY_SWITCH_LDFLAGS = @CRAY_SWITCH_LDFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
diff --git a/src/plugins/select/alps/libemulate/Makefile.in b/src/plugins/select/alps/libemulate/Makefile.in
index 93e79f298b93738df8acc23f37b9182a628da4dc..ad1dedb5eab64f315e290fcd9521fa81549616df 100644
--- a/src/plugins/select/alps/libemulate/Makefile.in
+++ b/src/plugins/select/alps/libemulate/Makefile.in
@@ -165,6 +165,8 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CRAY_CPPFLAGS = @CRAY_CPPFLAGS@
CRAY_LDFLAGS = @CRAY_LDFLAGS@
+CRAY_SWITCH_CPPFLAGS = @CRAY_SWITCH_CPPFLAGS@
+CRAY_SWITCH_LDFLAGS = @CRAY_SWITCH_LDFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
diff --git a/src/plugins/select/bluegene/Makefile.in b/src/plugins/select/bluegene/Makefile.in
index 0a4e86e4312d614f668ba5813783b8606513a3d9..6a91dc118d2168d93b91ff5bc032d58472e356ad 100644
--- a/src/plugins/select/bluegene/Makefile.in
+++ b/src/plugins/select/bluegene/Makefile.in
@@ -355,6 +355,8 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CRAY_CPPFLAGS = @CRAY_CPPFLAGS@
CRAY_LDFLAGS = @CRAY_LDFLAGS@
+CRAY_SWITCH_CPPFLAGS = @CRAY_SWITCH_CPPFLAGS@
+CRAY_SWITCH_LDFLAGS = @CRAY_SWITCH_LDFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
diff --git a/src/plugins/select/bluegene/ba/Makefile.in b/src/plugins/select/bluegene/ba/Makefile.in
index 47fa9f76436609b1ffcb344e5c17226f37991b2b..703637262ae5eac0e8084eb67a1101820b6d5fdc 100644
--- a/src/plugins/select/bluegene/ba/Makefile.in
+++ b/src/plugins/select/bluegene/ba/Makefile.in
@@ -175,6 +175,8 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CRAY_CPPFLAGS = @CRAY_CPPFLAGS@
CRAY_LDFLAGS = @CRAY_LDFLAGS@
+CRAY_SWITCH_CPPFLAGS = @CRAY_SWITCH_CPPFLAGS@
+CRAY_SWITCH_LDFLAGS = @CRAY_SWITCH_LDFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
diff --git a/src/plugins/select/bluegene/ba_bgq/Makefile.in b/src/plugins/select/bluegene/ba_bgq/Makefile.in
index e69b3a6a0ed422a0bdde7ec764e248065e8218c6..fea598c3afca8668242de315d2dda340ca75956e 100644
--- a/src/plugins/select/bluegene/ba_bgq/Makefile.in
+++ b/src/plugins/select/bluegene/ba_bgq/Makefile.in
@@ -185,6 +185,8 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CRAY_CPPFLAGS = @CRAY_CPPFLAGS@
CRAY_LDFLAGS = @CRAY_LDFLAGS@
+CRAY_SWITCH_CPPFLAGS = @CRAY_SWITCH_CPPFLAGS@
+CRAY_SWITCH_LDFLAGS = @CRAY_SWITCH_LDFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
diff --git a/src/plugins/select/bluegene/bl/Makefile.in b/src/plugins/select/bluegene/bl/Makefile.in
index e1744e672ad1d1c7152ed26b2b94800a2d6e4cd4..3936dedfe6d0df9dedf585df243250ea86fff1e2 100644
--- a/src/plugins/select/bluegene/bl/Makefile.in
+++ b/src/plugins/select/bluegene/bl/Makefile.in
@@ -164,6 +164,8 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CRAY_CPPFLAGS = @CRAY_CPPFLAGS@
CRAY_LDFLAGS = @CRAY_LDFLAGS@
+CRAY_SWITCH_CPPFLAGS = @CRAY_SWITCH_CPPFLAGS@
+CRAY_SWITCH_LDFLAGS = @CRAY_SWITCH_LDFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
diff --git a/src/plugins/select/bluegene/bl_bgq/Makefile.in b/src/plugins/select/bluegene/bl_bgq/Makefile.in
index 2634b8f738361c146d95770a0f28778f90aa5e2d..24dbfce938422ee0e10c6dcbecad8f7a2ac50da1 100644
--- a/src/plugins/select/bluegene/bl_bgq/Makefile.in
+++ b/src/plugins/select/bluegene/bl_bgq/Makefile.in
@@ -173,6 +173,8 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CRAY_CPPFLAGS = @CRAY_CPPFLAGS@
CRAY_LDFLAGS = @CRAY_LDFLAGS@
+CRAY_SWITCH_CPPFLAGS = @CRAY_SWITCH_CPPFLAGS@
+CRAY_SWITCH_LDFLAGS = @CRAY_SWITCH_LDFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
diff --git a/src/plugins/select/bluegene/sfree/Makefile.in b/src/plugins/select/bluegene/sfree/Makefile.in
index 7e318a461607576633404a06884c6c6d0e2b860a..bff95c056f134145019ba0a84ed9b8db6240416a 100644
--- a/src/plugins/select/bluegene/sfree/Makefile.in
+++ b/src/plugins/select/bluegene/sfree/Makefile.in
@@ -167,6 +167,8 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CRAY_CPPFLAGS = @CRAY_CPPFLAGS@
CRAY_LDFLAGS = @CRAY_LDFLAGS@
+CRAY_SWITCH_CPPFLAGS = @CRAY_SWITCH_CPPFLAGS@
+CRAY_SWITCH_LDFLAGS = @CRAY_SWITCH_LDFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
diff --git a/src/plugins/select/cons_res/Makefile.in b/src/plugins/select/cons_res/Makefile.in
index 472261dc0cf52987f3e2bc564da986c9da0eeca8..6cdc2a79134ac55c179f936f0980720086b35b57 100644
--- a/src/plugins/select/cons_res/Makefile.in
+++ b/src/plugins/select/cons_res/Makefile.in
@@ -192,6 +192,8 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CRAY_CPPFLAGS = @CRAY_CPPFLAGS@
CRAY_LDFLAGS = @CRAY_LDFLAGS@
+CRAY_SWITCH_CPPFLAGS = @CRAY_SWITCH_CPPFLAGS@
+CRAY_SWITCH_LDFLAGS = @CRAY_SWITCH_LDFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
diff --git a/src/plugins/select/cray/Makefile.in b/src/plugins/select/cray/Makefile.in
index 257843ee2961421a6c84c195a4a81b29a44639b3..6bef0a82c7d3a241e0520dd2d2477087f5fedbbd 100644
--- a/src/plugins/select/cray/Makefile.in
+++ b/src/plugins/select/cray/Makefile.in
@@ -191,6 +191,8 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CRAY_CPPFLAGS = @CRAY_CPPFLAGS@
CRAY_LDFLAGS = @CRAY_LDFLAGS@
+CRAY_SWITCH_CPPFLAGS = @CRAY_SWITCH_CPPFLAGS@
+CRAY_SWITCH_LDFLAGS = @CRAY_SWITCH_LDFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
diff --git a/src/plugins/select/linear/Makefile.in b/src/plugins/select/linear/Makefile.in
index d3debf283a1b24e50b54224ae7ba9780213a2775..636088f96adcc031b2bba3f0db960bf33ee5f7c5 100644
--- a/src/plugins/select/linear/Makefile.in
+++ b/src/plugins/select/linear/Makefile.in
@@ -191,6 +191,8 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CRAY_CPPFLAGS = @CRAY_CPPFLAGS@
CRAY_LDFLAGS = @CRAY_LDFLAGS@
+CRAY_SWITCH_CPPFLAGS = @CRAY_SWITCH_CPPFLAGS@
+CRAY_SWITCH_LDFLAGS = @CRAY_SWITCH_LDFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
diff --git a/src/plugins/select/other/Makefile.in b/src/plugins/select/other/Makefile.in
index 0ad3a17b85fb5b60e59b18d38787309ca1298eb0..6f2f7f04ee2d9293c7bfcbe54483a33251f9c778 100644
--- a/src/plugins/select/other/Makefile.in
+++ b/src/plugins/select/other/Makefile.in
@@ -160,6 +160,8 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CRAY_CPPFLAGS = @CRAY_CPPFLAGS@
CRAY_LDFLAGS = @CRAY_LDFLAGS@
+CRAY_SWITCH_CPPFLAGS = @CRAY_SWITCH_CPPFLAGS@
+CRAY_SWITCH_LDFLAGS = @CRAY_SWITCH_LDFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
diff --git a/src/plugins/select/serial/Makefile.in b/src/plugins/select/serial/Makefile.in
index 526d8a266c117a3f68f0397f170ee0fecc372771..c0cf029122fd6b91d0d667cfdf1b902106f127a6 100644
--- a/src/plugins/select/serial/Makefile.in
+++ b/src/plugins/select/serial/Makefile.in
@@ -192,6 +192,8 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CRAY_CPPFLAGS = @CRAY_CPPFLAGS@
CRAY_LDFLAGS = @CRAY_LDFLAGS@
+CRAY_SWITCH_CPPFLAGS = @CRAY_SWITCH_CPPFLAGS@
+CRAY_SWITCH_LDFLAGS = @CRAY_SWITCH_LDFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
diff --git a/src/plugins/slurmctld/Makefile.in b/src/plugins/slurmctld/Makefile.in
index d57df710bcef97e663e916118edda393a179aadd..9c3d927ef4cb4b64397feb0438768328a6032b0d 100644
--- a/src/plugins/slurmctld/Makefile.in
+++ b/src/plugins/slurmctld/Makefile.in
@@ -180,6 +180,8 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CRAY_CPPFLAGS = @CRAY_CPPFLAGS@
CRAY_LDFLAGS = @CRAY_LDFLAGS@
+CRAY_SWITCH_CPPFLAGS = @CRAY_SWITCH_CPPFLAGS@
+CRAY_SWITCH_LDFLAGS = @CRAY_SWITCH_LDFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
diff --git a/src/plugins/slurmctld/dynalloc/Makefile.in b/src/plugins/slurmctld/dynalloc/Makefile.in
index 6ef5ffa9e57e5da919e3f541b98a264645eef527..4aed9d69b62ddf41a0738a607a82a6b2dbd9af7c 100644
--- a/src/plugins/slurmctld/dynalloc/Makefile.in
+++ b/src/plugins/slurmctld/dynalloc/Makefile.in
@@ -206,6 +206,8 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CRAY_CPPFLAGS = @CRAY_CPPFLAGS@
CRAY_LDFLAGS = @CRAY_LDFLAGS@
+CRAY_SWITCH_CPPFLAGS = @CRAY_SWITCH_CPPFLAGS@
+CRAY_SWITCH_LDFLAGS = @CRAY_SWITCH_LDFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
diff --git a/src/plugins/switch/Makefile.in b/src/plugins/switch/Makefile.in
index 8a676cd1fe48d409f45930e4daf83e8863689701..8769f9d9a071017f1923f116a30031b91c96f623 100644
--- a/src/plugins/switch/Makefile.in
+++ b/src/plugins/switch/Makefile.in
@@ -180,6 +180,8 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CRAY_CPPFLAGS = @CRAY_CPPFLAGS@
CRAY_LDFLAGS = @CRAY_LDFLAGS@
+CRAY_SWITCH_CPPFLAGS = @CRAY_SWITCH_CPPFLAGS@
+CRAY_SWITCH_LDFLAGS = @CRAY_SWITCH_LDFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
diff --git a/src/plugins/switch/cray/Makefile.am b/src/plugins/switch/cray/Makefile.am
index 78d2920e8012a77aba3704708438445894bd10d2..87e8ecc0d114154b5c17be586336fce643b3744e 100644
--- a/src/plugins/switch/cray/Makefile.am
+++ b/src/plugins/switch/cray/Makefile.am
@@ -4,10 +4,12 @@ AUTOMAKE_OPTIONS = foreign
PLUGIN_FLAGS = -module -avoid-version --export-dynamic
-AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common
+AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common \
+ $(CRAY_CPPFLAGS) $(CRAY_SWITCH_CPPFLAGS)
pkglib_LTLIBRARIES = switch_cray.la
# Null switch plugin.
switch_cray_la_SOURCES = switch_cray.c
-switch_cray_la_LDFLAGS = $(SO_LDFLAGS) $(PLUGIN_FLAGS)
+switch_cray_la_LDFLAGS = $(SO_LDFLAGS) $(PLUGIN_FLAGS) \
+ $(CRAY_LDFLAGS) $(CRAY_SWITCH_LDFLAGS)
diff --git a/src/plugins/switch/cray/Makefile.in b/src/plugins/switch/cray/Makefile.in
index fb77a57ce94980c354f82546ff4949d935109220..71219cc96035bd4856246675947ba6d663c4aa23 100644
--- a/src/plugins/switch/cray/Makefile.in
+++ b/src/plugins/switch/cray/Makefile.in
@@ -191,6 +191,8 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CRAY_CPPFLAGS = @CRAY_CPPFLAGS@
CRAY_LDFLAGS = @CRAY_LDFLAGS@
+CRAY_SWITCH_CPPFLAGS = @CRAY_SWITCH_CPPFLAGS@
+CRAY_SWITCH_LDFLAGS = @CRAY_SWITCH_LDFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
@@ -395,12 +397,16 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign
PLUGIN_FLAGS = -module -avoid-version --export-dynamic
-AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common
+AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common \
+ $(CRAY_CPPFLAGS) $(CRAY_SWITCH_CPPFLAGS)
+
pkglib_LTLIBRARIES = switch_cray.la
# Null switch plugin.
switch_cray_la_SOURCES = switch_cray.c
-switch_cray_la_LDFLAGS = $(SO_LDFLAGS) $(PLUGIN_FLAGS)
+switch_cray_la_LDFLAGS = $(SO_LDFLAGS) $(PLUGIN_FLAGS) \
+ $(CRAY_LDFLAGS) $(CRAY_SWITCH_LDFLAGS)
+
all: all-am
.SUFFIXES:
diff --git a/src/plugins/switch/none/Makefile.in b/src/plugins/switch/none/Makefile.in
index 3857543b05996ac17992a4dc6b21c39a986cad05..8c470f21e12e3f00924e91dab2ef459bbdeb4102 100644
--- a/src/plugins/switch/none/Makefile.in
+++ b/src/plugins/switch/none/Makefile.in
@@ -191,6 +191,8 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CRAY_CPPFLAGS = @CRAY_CPPFLAGS@
CRAY_LDFLAGS = @CRAY_LDFLAGS@
+CRAY_SWITCH_CPPFLAGS = @CRAY_SWITCH_CPPFLAGS@
+CRAY_SWITCH_LDFLAGS = @CRAY_SWITCH_LDFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
diff --git a/src/plugins/switch/nrt/Makefile.in b/src/plugins/switch/nrt/Makefile.in
index 1b7ceee3f5f06f3e40551cb458b9a5601dbd0329..29ac938775c7bd9bc428312eb0e54c43e02a0053 100644
--- a/src/plugins/switch/nrt/Makefile.in
+++ b/src/plugins/switch/nrt/Makefile.in
@@ -236,6 +236,8 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CRAY_CPPFLAGS = @CRAY_CPPFLAGS@
CRAY_LDFLAGS = @CRAY_LDFLAGS@
+CRAY_SWITCH_CPPFLAGS = @CRAY_SWITCH_CPPFLAGS@
+CRAY_SWITCH_LDFLAGS = @CRAY_SWITCH_LDFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
diff --git a/src/plugins/switch/nrt/libpermapi/Makefile.in b/src/plugins/switch/nrt/libpermapi/Makefile.in
index 8516d8386041a94642cd1f1eb25e205057efe380..5ad7a938e6f39d60b383e02c1983154c02b33670 100644
--- a/src/plugins/switch/nrt/libpermapi/Makefile.in
+++ b/src/plugins/switch/nrt/libpermapi/Makefile.in
@@ -193,6 +193,8 @@ CPP = @CPP@
CPPFLAGS = -DMYSELF_SO=\"$(libdir)/slurm/libpermapi.so\"
CRAY_CPPFLAGS = @CRAY_CPPFLAGS@
CRAY_LDFLAGS = @CRAY_LDFLAGS@
+CRAY_SWITCH_CPPFLAGS = @CRAY_SWITCH_CPPFLAGS@
+CRAY_SWITCH_LDFLAGS = @CRAY_SWITCH_LDFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
diff --git a/src/plugins/task/Makefile.in b/src/plugins/task/Makefile.in
index 67bcad5bb8c1b907951eeda590b5b3b4d0bb8e98..2f3c280995c54fc4b78e2d2844aff7d748f0f882 100644
--- a/src/plugins/task/Makefile.in
+++ b/src/plugins/task/Makefile.in
@@ -180,6 +180,8 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CRAY_CPPFLAGS = @CRAY_CPPFLAGS@
CRAY_LDFLAGS = @CRAY_LDFLAGS@
+CRAY_SWITCH_CPPFLAGS = @CRAY_SWITCH_CPPFLAGS@
+CRAY_SWITCH_LDFLAGS = @CRAY_SWITCH_LDFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
diff --git a/src/plugins/task/affinity/Makefile.in b/src/plugins/task/affinity/Makefile.in
index 620edd622a8e910086ef0b417745424d9a5c25ce..70ba37d9bb76e383d07a815c89f6b447d0315b67 100644
--- a/src/plugins/task/affinity/Makefile.in
+++ b/src/plugins/task/affinity/Makefile.in
@@ -203,6 +203,8 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CRAY_CPPFLAGS = @CRAY_CPPFLAGS@
CRAY_LDFLAGS = @CRAY_LDFLAGS@
+CRAY_SWITCH_CPPFLAGS = @CRAY_SWITCH_CPPFLAGS@
+CRAY_SWITCH_LDFLAGS = @CRAY_SWITCH_LDFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
diff --git a/src/plugins/task/cgroup/Makefile.in b/src/plugins/task/cgroup/Makefile.in
index e61b5d48b954a4cb65e7588129d2d3565911b9bf..0974de76cc5d29b553e5f023ec38585aa76eaf0a 100644
--- a/src/plugins/task/cgroup/Makefile.in
+++ b/src/plugins/task/cgroup/Makefile.in
@@ -192,6 +192,8 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CRAY_CPPFLAGS = @CRAY_CPPFLAGS@
CRAY_LDFLAGS = @CRAY_LDFLAGS@
+CRAY_SWITCH_CPPFLAGS = @CRAY_SWITCH_CPPFLAGS@
+CRAY_SWITCH_LDFLAGS = @CRAY_SWITCH_LDFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
diff --git a/src/plugins/task/cray/Makefile.in b/src/plugins/task/cray/Makefile.in
index 084dc98eca35aded2795e5915a4f6a6f8f93e47f..d5099fc9e423cd6df60cd8b8c975742366201471 100644
--- a/src/plugins/task/cray/Makefile.in
+++ b/src/plugins/task/cray/Makefile.in
@@ -191,6 +191,8 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CRAY_CPPFLAGS = @CRAY_CPPFLAGS@
CRAY_LDFLAGS = @CRAY_LDFLAGS@
+CRAY_SWITCH_CPPFLAGS = @CRAY_SWITCH_CPPFLAGS@
+CRAY_SWITCH_LDFLAGS = @CRAY_SWITCH_LDFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
diff --git a/src/plugins/task/none/Makefile.in b/src/plugins/task/none/Makefile.in
index 6cfff463f737ef878ee78293f86f936e5d52b921..1f343e17196f81e45e98c8aacad686a590292b19 100644
--- a/src/plugins/task/none/Makefile.in
+++ b/src/plugins/task/none/Makefile.in
@@ -191,6 +191,8 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CRAY_CPPFLAGS = @CRAY_CPPFLAGS@
CRAY_LDFLAGS = @CRAY_LDFLAGS@
+CRAY_SWITCH_CPPFLAGS = @CRAY_SWITCH_CPPFLAGS@
+CRAY_SWITCH_LDFLAGS = @CRAY_SWITCH_LDFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
diff --git a/src/plugins/topology/3d_torus/Makefile.in b/src/plugins/topology/3d_torus/Makefile.in
index accc67378e824e1625755e70613950ec8949c073..e170df590bda21f82fc9cd318232d4fa290619f8 100644
--- a/src/plugins/topology/3d_torus/Makefile.in
+++ b/src/plugins/topology/3d_torus/Makefile.in
@@ -192,6 +192,8 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CRAY_CPPFLAGS = @CRAY_CPPFLAGS@
CRAY_LDFLAGS = @CRAY_LDFLAGS@
+CRAY_SWITCH_CPPFLAGS = @CRAY_SWITCH_CPPFLAGS@
+CRAY_SWITCH_LDFLAGS = @CRAY_SWITCH_LDFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
diff --git a/src/plugins/topology/Makefile.in b/src/plugins/topology/Makefile.in
index e49c1c009e1b14d4833b713b7ea811cb44a9aed2..9abfc3a5cc5edc423b142d6c82e74bd66202c423 100644
--- a/src/plugins/topology/Makefile.in
+++ b/src/plugins/topology/Makefile.in
@@ -180,6 +180,8 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CRAY_CPPFLAGS = @CRAY_CPPFLAGS@
CRAY_LDFLAGS = @CRAY_LDFLAGS@
+CRAY_SWITCH_CPPFLAGS = @CRAY_SWITCH_CPPFLAGS@
+CRAY_SWITCH_LDFLAGS = @CRAY_SWITCH_LDFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
diff --git a/src/plugins/topology/node_rank/Makefile.in b/src/plugins/topology/node_rank/Makefile.in
index 3b6352eab1c7f54de2145cde5e7fc308986238e7..4b4e99afd83eabc45ca1e3384487c8b57a7d8a3f 100644
--- a/src/plugins/topology/node_rank/Makefile.in
+++ b/src/plugins/topology/node_rank/Makefile.in
@@ -191,6 +191,8 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CRAY_CPPFLAGS = @CRAY_CPPFLAGS@
CRAY_LDFLAGS = @CRAY_LDFLAGS@
+CRAY_SWITCH_CPPFLAGS = @CRAY_SWITCH_CPPFLAGS@
+CRAY_SWITCH_LDFLAGS = @CRAY_SWITCH_LDFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
diff --git a/src/plugins/topology/none/Makefile.in b/src/plugins/topology/none/Makefile.in
index 563fa0bf0d1915b1eedcc7c7392970e89804a19e..4b1cadeb56569a7ae8eb04b88c9efd383a21c837 100644
--- a/src/plugins/topology/none/Makefile.in
+++ b/src/plugins/topology/none/Makefile.in
@@ -191,6 +191,8 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CRAY_CPPFLAGS = @CRAY_CPPFLAGS@
CRAY_LDFLAGS = @CRAY_LDFLAGS@
+CRAY_SWITCH_CPPFLAGS = @CRAY_SWITCH_CPPFLAGS@
+CRAY_SWITCH_LDFLAGS = @CRAY_SWITCH_LDFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
diff --git a/src/plugins/topology/tree/Makefile.in b/src/plugins/topology/tree/Makefile.in
index d9fe5551c2916b574829ab089c48f9158d8c4bb5..82e099741d1a0cf33a4061425c084943ac270b37 100644
--- a/src/plugins/topology/tree/Makefile.in
+++ b/src/plugins/topology/tree/Makefile.in
@@ -191,6 +191,8 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CRAY_CPPFLAGS = @CRAY_CPPFLAGS@
CRAY_LDFLAGS = @CRAY_LDFLAGS@
+CRAY_SWITCH_CPPFLAGS = @CRAY_SWITCH_CPPFLAGS@
+CRAY_SWITCH_LDFLAGS = @CRAY_SWITCH_LDFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
diff --git a/src/sacct/Makefile.in b/src/sacct/Makefile.in
index d3537254c1aac78bbeb75143b11c1df0b107236a..a3329775cc0211780ef3644e52ef29e9d45a465c 100644
--- a/src/sacct/Makefile.in
+++ b/src/sacct/Makefile.in
@@ -171,6 +171,8 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CRAY_CPPFLAGS = @CRAY_CPPFLAGS@
CRAY_LDFLAGS = @CRAY_LDFLAGS@
+CRAY_SWITCH_CPPFLAGS = @CRAY_SWITCH_CPPFLAGS@
+CRAY_SWITCH_LDFLAGS = @CRAY_SWITCH_LDFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
diff --git a/src/sacctmgr/Makefile.in b/src/sacctmgr/Makefile.in
index f8df6d785c6aa4cfdbe3c0aa092268f450b878f0..7eeb8134e4917a602b8a81e68bced33520bfa410 100644
--- a/src/sacctmgr/Makefile.in
+++ b/src/sacctmgr/Makefile.in
@@ -174,6 +174,8 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CRAY_CPPFLAGS = @CRAY_CPPFLAGS@
CRAY_LDFLAGS = @CRAY_LDFLAGS@
+CRAY_SWITCH_CPPFLAGS = @CRAY_SWITCH_CPPFLAGS@
+CRAY_SWITCH_LDFLAGS = @CRAY_SWITCH_LDFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
diff --git a/src/salloc/Makefile.in b/src/salloc/Makefile.in
index 54dc603dd584d1f92bcbdc453f2c4f73519fd80f..922fb8b6e47c4e761d34d5bcb5b18945d278f4f3 100644
--- a/src/salloc/Makefile.in
+++ b/src/salloc/Makefile.in
@@ -169,6 +169,8 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CRAY_CPPFLAGS = @CRAY_CPPFLAGS@
CRAY_LDFLAGS = @CRAY_LDFLAGS@
+CRAY_SWITCH_CPPFLAGS = @CRAY_SWITCH_CPPFLAGS@
+CRAY_SWITCH_LDFLAGS = @CRAY_SWITCH_LDFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
diff --git a/src/sattach/Makefile.in b/src/sattach/Makefile.in
index f14e15ec8cb5929338352269d9e32ea97c1ca4ce..4cea0d586c3ac8624dba23b261918b1077a4fd62 100644
--- a/src/sattach/Makefile.in
+++ b/src/sattach/Makefile.in
@@ -169,6 +169,8 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CRAY_CPPFLAGS = @CRAY_CPPFLAGS@
CRAY_LDFLAGS = @CRAY_LDFLAGS@
+CRAY_SWITCH_CPPFLAGS = @CRAY_SWITCH_CPPFLAGS@
+CRAY_SWITCH_LDFLAGS = @CRAY_SWITCH_LDFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
diff --git a/src/sbatch/Makefile.in b/src/sbatch/Makefile.in
index 712e047317fd411e89ab2ade71c93b9c300c1891..f9ae52747b95c421ccf0fbc915bbc84371652bda 100644
--- a/src/sbatch/Makefile.in
+++ b/src/sbatch/Makefile.in
@@ -169,6 +169,8 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CRAY_CPPFLAGS = @CRAY_CPPFLAGS@
CRAY_LDFLAGS = @CRAY_LDFLAGS@
+CRAY_SWITCH_CPPFLAGS = @CRAY_SWITCH_CPPFLAGS@
+CRAY_SWITCH_LDFLAGS = @CRAY_SWITCH_LDFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
diff --git a/src/sbcast/Makefile.in b/src/sbcast/Makefile.in
index 1c4913c031cba0d106cb266858ea5f063bc058a6..c9b601de9c1486c6d6ddbb4d72a79aa22ae78fc8 100644
--- a/src/sbcast/Makefile.in
+++ b/src/sbcast/Makefile.in
@@ -171,6 +171,8 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CRAY_CPPFLAGS = @CRAY_CPPFLAGS@
CRAY_LDFLAGS = @CRAY_LDFLAGS@
+CRAY_SWITCH_CPPFLAGS = @CRAY_SWITCH_CPPFLAGS@
+CRAY_SWITCH_LDFLAGS = @CRAY_SWITCH_LDFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
diff --git a/src/scancel/Makefile.in b/src/scancel/Makefile.in
index 2fc372236ffb32f1a59f7e8be6961f5ba8ed7b78..0946b54fd1a691c0f35f70da8e03a1577977ac32 100644
--- a/src/scancel/Makefile.in
+++ b/src/scancel/Makefile.in
@@ -170,6 +170,8 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CRAY_CPPFLAGS = @CRAY_CPPFLAGS@
CRAY_LDFLAGS = @CRAY_LDFLAGS@
+CRAY_SWITCH_CPPFLAGS = @CRAY_SWITCH_CPPFLAGS@
+CRAY_SWITCH_LDFLAGS = @CRAY_SWITCH_LDFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
diff --git a/src/scontrol/Makefile.in b/src/scontrol/Makefile.in
index 0c209bccd833613e7081014dfb5fa7e5603eff96..fe7f2ba0130c354d7ecc8e433fa40852da511df8 100644
--- a/src/scontrol/Makefile.in
+++ b/src/scontrol/Makefile.in
@@ -172,6 +172,8 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CRAY_CPPFLAGS = @CRAY_CPPFLAGS@
CRAY_LDFLAGS = @CRAY_LDFLAGS@
+CRAY_SWITCH_CPPFLAGS = @CRAY_SWITCH_CPPFLAGS@
+CRAY_SWITCH_LDFLAGS = @CRAY_SWITCH_LDFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
diff --git a/src/sdiag/Makefile.in b/src/sdiag/Makefile.in
index ed0e2ed26676b8a0122d05326cc87d0183e0f94e..19877792add0fc167b1dc9229c63477b2d2bddd2 100644
--- a/src/sdiag/Makefile.in
+++ b/src/sdiag/Makefile.in
@@ -168,6 +168,8 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CRAY_CPPFLAGS = @CRAY_CPPFLAGS@
CRAY_LDFLAGS = @CRAY_LDFLAGS@
+CRAY_SWITCH_CPPFLAGS = @CRAY_SWITCH_CPPFLAGS@
+CRAY_SWITCH_LDFLAGS = @CRAY_SWITCH_LDFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
diff --git a/src/sinfo/Makefile.in b/src/sinfo/Makefile.in
index dcbb2c429f2a5480baf9b6f4263b8f0428c2a8ae..757879bc8b6a41a65ed4ec22f7d845b37a43dc9f 100644
--- a/src/sinfo/Makefile.in
+++ b/src/sinfo/Makefile.in
@@ -172,6 +172,8 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CRAY_CPPFLAGS = @CRAY_CPPFLAGS@
CRAY_LDFLAGS = @CRAY_LDFLAGS@
+CRAY_SWITCH_CPPFLAGS = @CRAY_SWITCH_CPPFLAGS@
+CRAY_SWITCH_LDFLAGS = @CRAY_SWITCH_LDFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
diff --git a/src/slurmctld/Makefile.in b/src/slurmctld/Makefile.in
index af7922440d542bf3ed4800badd8d51f54708ed2a..30430ca0c42110fbbdff40aade9c4376cb9f1422 100644
--- a/src/slurmctld/Makefile.in
+++ b/src/slurmctld/Makefile.in
@@ -179,6 +179,8 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CRAY_CPPFLAGS = @CRAY_CPPFLAGS@
CRAY_LDFLAGS = @CRAY_LDFLAGS@
+CRAY_SWITCH_CPPFLAGS = @CRAY_SWITCH_CPPFLAGS@
+CRAY_SWITCH_LDFLAGS = @CRAY_SWITCH_LDFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
diff --git a/src/slurmd/Makefile.in b/src/slurmd/Makefile.in
index 7654eb241bedd040ad0571f0ef9e1763067b632b..07011a3a88d5fb48aca7d1a5f05995b33c629e0d 100644
--- a/src/slurmd/Makefile.in
+++ b/src/slurmd/Makefile.in
@@ -178,6 +178,8 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CRAY_CPPFLAGS = @CRAY_CPPFLAGS@
CRAY_LDFLAGS = @CRAY_LDFLAGS@
+CRAY_SWITCH_CPPFLAGS = @CRAY_SWITCH_CPPFLAGS@
+CRAY_SWITCH_LDFLAGS = @CRAY_SWITCH_LDFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
diff --git a/src/slurmd/common/Makefile.in b/src/slurmd/common/Makefile.in
index ff246ea8003574575d2b6b170fb0578d0c7d154f..6e7aef99e3c98c99bca2a738b8fbc7178dd68786 100644
--- a/src/slurmd/common/Makefile.in
+++ b/src/slurmd/common/Makefile.in
@@ -162,6 +162,8 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CRAY_CPPFLAGS = @CRAY_CPPFLAGS@
CRAY_LDFLAGS = @CRAY_LDFLAGS@
+CRAY_SWITCH_CPPFLAGS = @CRAY_SWITCH_CPPFLAGS@
+CRAY_SWITCH_LDFLAGS = @CRAY_SWITCH_LDFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
diff --git a/src/slurmd/slurmd/Makefile.in b/src/slurmd/slurmd/Makefile.in
index a4bfb9ab762fc87302f87deb81fb8a0c05ef1adc..bb80ce097e40553a02168fa24fbe42a9502f33df 100644
--- a/src/slurmd/slurmd/Makefile.in
+++ b/src/slurmd/slurmd/Makefile.in
@@ -172,6 +172,8 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CRAY_CPPFLAGS = @CRAY_CPPFLAGS@
CRAY_LDFLAGS = @CRAY_LDFLAGS@
+CRAY_SWITCH_CPPFLAGS = @CRAY_SWITCH_CPPFLAGS@
+CRAY_SWITCH_LDFLAGS = @CRAY_SWITCH_LDFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
diff --git a/src/slurmd/slurmstepd/Makefile.in b/src/slurmd/slurmstepd/Makefile.in
index 3f487ca3b32e2af517394a165dd5b1634c91ccb5..22c0439bf41d8953ed0cf65e5f2bfc98c11796fb 100644
--- a/src/slurmd/slurmstepd/Makefile.in
+++ b/src/slurmd/slurmstepd/Makefile.in
@@ -174,6 +174,8 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CRAY_CPPFLAGS = @CRAY_CPPFLAGS@
CRAY_LDFLAGS = @CRAY_LDFLAGS@
+CRAY_SWITCH_CPPFLAGS = @CRAY_SWITCH_CPPFLAGS@
+CRAY_SWITCH_LDFLAGS = @CRAY_SWITCH_LDFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
diff --git a/src/slurmdbd/Makefile.in b/src/slurmdbd/Makefile.in
index db0678d2ddbfa58ba20280a37377ac91e099e4ae..d4a2e0fd50461bcf482fa8ce7a1e99a9b9fb96b9 100644
--- a/src/slurmdbd/Makefile.in
+++ b/src/slurmdbd/Makefile.in
@@ -170,6 +170,8 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CRAY_CPPFLAGS = @CRAY_CPPFLAGS@
CRAY_LDFLAGS = @CRAY_LDFLAGS@
+CRAY_SWITCH_CPPFLAGS = @CRAY_SWITCH_CPPFLAGS@
+CRAY_SWITCH_LDFLAGS = @CRAY_SWITCH_LDFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
diff --git a/src/smap/Makefile.in b/src/smap/Makefile.in
index a37b10d8fa0e0947eabcf5ec79ce92ea12c42704..93fd2ff547e79863ef4ef17d83b928bceebaaf8a 100644
--- a/src/smap/Makefile.in
+++ b/src/smap/Makefile.in
@@ -190,6 +190,8 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CRAY_CPPFLAGS = @CRAY_CPPFLAGS@
CRAY_LDFLAGS = @CRAY_LDFLAGS@
+CRAY_SWITCH_CPPFLAGS = @CRAY_SWITCH_CPPFLAGS@
+CRAY_SWITCH_LDFLAGS = @CRAY_SWITCH_LDFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
diff --git a/src/sprio/Makefile.in b/src/sprio/Makefile.in
index 3bfdb22f981d05bc95723c8a1642517eda9b9815..72c62dc82359925b2d1ca050a43077d2fa98cbe6 100644
--- a/src/sprio/Makefile.in
+++ b/src/sprio/Makefile.in
@@ -171,6 +171,8 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CRAY_CPPFLAGS = @CRAY_CPPFLAGS@
CRAY_LDFLAGS = @CRAY_LDFLAGS@
+CRAY_SWITCH_CPPFLAGS = @CRAY_SWITCH_CPPFLAGS@
+CRAY_SWITCH_LDFLAGS = @CRAY_SWITCH_LDFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
diff --git a/src/squeue/Makefile.in b/src/squeue/Makefile.in
index b3a6fef4a0de713f541583ebc59efc79682f5064..fc44a336d0173ecc6e246d9dcc9a5b58028fca89 100644
--- a/src/squeue/Makefile.in
+++ b/src/squeue/Makefile.in
@@ -172,6 +172,8 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CRAY_CPPFLAGS = @CRAY_CPPFLAGS@
CRAY_LDFLAGS = @CRAY_LDFLAGS@
+CRAY_SWITCH_CPPFLAGS = @CRAY_SWITCH_CPPFLAGS@
+CRAY_SWITCH_LDFLAGS = @CRAY_SWITCH_LDFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
diff --git a/src/sreport/Makefile.in b/src/sreport/Makefile.in
index 867a1059e955d3f507f82d7d8bda762a24b2fe96..932871c6a4af8caa04cb2696b88476e19141ea0f 100644
--- a/src/sreport/Makefile.in
+++ b/src/sreport/Makefile.in
@@ -169,6 +169,8 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CRAY_CPPFLAGS = @CRAY_CPPFLAGS@
CRAY_LDFLAGS = @CRAY_LDFLAGS@
+CRAY_SWITCH_CPPFLAGS = @CRAY_SWITCH_CPPFLAGS@
+CRAY_SWITCH_LDFLAGS = @CRAY_SWITCH_LDFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
diff --git a/src/srun/Makefile.in b/src/srun/Makefile.in
index 341f7fb784c19c445951c7d201519ecb7ddf7ff8..9a237d39f082958c143ea1561963661177c1ac94 100644
--- a/src/srun/Makefile.in
+++ b/src/srun/Makefile.in
@@ -209,6 +209,8 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CRAY_CPPFLAGS = @CRAY_CPPFLAGS@
CRAY_LDFLAGS = @CRAY_LDFLAGS@
+CRAY_SWITCH_CPPFLAGS = @CRAY_SWITCH_CPPFLAGS@
+CRAY_SWITCH_LDFLAGS = @CRAY_SWITCH_LDFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
diff --git a/src/srun/libsrun/Makefile.in b/src/srun/libsrun/Makefile.in
index fe52c2db54d70ebf60bdbaadb61561e6cbd12b48..9d6a1147c3bf74d034a1c690dd74f00b60f0774a 100644
--- a/src/srun/libsrun/Makefile.in
+++ b/src/srun/libsrun/Makefile.in
@@ -165,6 +165,8 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CRAY_CPPFLAGS = @CRAY_CPPFLAGS@
CRAY_LDFLAGS = @CRAY_LDFLAGS@
+CRAY_SWITCH_CPPFLAGS = @CRAY_SWITCH_CPPFLAGS@
+CRAY_SWITCH_LDFLAGS = @CRAY_SWITCH_LDFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
diff --git a/src/srun_cr/Makefile.in b/src/srun_cr/Makefile.in
index 6298dac218742217124326adfd5c3fbd3ed0d898..54d8880a7c7cc40c8e459b86b7eb046c277a63f4 100644
--- a/src/srun_cr/Makefile.in
+++ b/src/srun_cr/Makefile.in
@@ -173,6 +173,8 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CRAY_CPPFLAGS = @CRAY_CPPFLAGS@
CRAY_LDFLAGS = @CRAY_LDFLAGS@
+CRAY_SWITCH_CPPFLAGS = @CRAY_SWITCH_CPPFLAGS@
+CRAY_SWITCH_LDFLAGS = @CRAY_SWITCH_LDFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
diff --git a/src/sshare/Makefile.in b/src/sshare/Makefile.in
index b45959f6ee3822578422f895851af887b13cc7d4..4f69f533bdf12949f0c144a09346bd5b4f441dcc 100644
--- a/src/sshare/Makefile.in
+++ b/src/sshare/Makefile.in
@@ -167,6 +167,8 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CRAY_CPPFLAGS = @CRAY_CPPFLAGS@
CRAY_LDFLAGS = @CRAY_LDFLAGS@
+CRAY_SWITCH_CPPFLAGS = @CRAY_SWITCH_CPPFLAGS@
+CRAY_SWITCH_LDFLAGS = @CRAY_SWITCH_LDFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
diff --git a/src/sstat/Makefile.in b/src/sstat/Makefile.in
index 374868b18e81eff2be230f46f879a897d5afe886..683ce89563205c9f26aad0b99203782d9c9cab2a 100644
--- a/src/sstat/Makefile.in
+++ b/src/sstat/Makefile.in
@@ -168,6 +168,8 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CRAY_CPPFLAGS = @CRAY_CPPFLAGS@
CRAY_LDFLAGS = @CRAY_LDFLAGS@
+CRAY_SWITCH_CPPFLAGS = @CRAY_SWITCH_CPPFLAGS@
+CRAY_SWITCH_LDFLAGS = @CRAY_SWITCH_LDFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
diff --git a/src/strigger/Makefile.in b/src/strigger/Makefile.in
index e033a1fb7b8c3e37c844def0248a37a00c4062b2..221d1bfb80810d237866469b84f2084caac88576 100644
--- a/src/strigger/Makefile.in
+++ b/src/strigger/Makefile.in
@@ -171,6 +171,8 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CRAY_CPPFLAGS = @CRAY_CPPFLAGS@
CRAY_LDFLAGS = @CRAY_LDFLAGS@
+CRAY_SWITCH_CPPFLAGS = @CRAY_SWITCH_CPPFLAGS@
+CRAY_SWITCH_LDFLAGS = @CRAY_SWITCH_LDFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
diff --git a/src/sview/Makefile.in b/src/sview/Makefile.in
index d48f8044a229e0a80960c1636331ed5c0c481e60..dab547a10ad5d76ac61532eea241f26d036cc994 100644
--- a/src/sview/Makefile.in
+++ b/src/sview/Makefile.in
@@ -196,6 +196,8 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CRAY_CPPFLAGS = @CRAY_CPPFLAGS@
CRAY_LDFLAGS = @CRAY_LDFLAGS@
+CRAY_SWITCH_CPPFLAGS = @CRAY_SWITCH_CPPFLAGS@
+CRAY_SWITCH_LDFLAGS = @CRAY_SWITCH_LDFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
diff --git a/testsuite/Makefile.in b/testsuite/Makefile.in
index 39da63dc9ce01ac152f20150d5563b559f4c72c1..0df6a27cd20de2e50103a2f56d9b21967e8ca680 100644
--- a/testsuite/Makefile.in
+++ b/testsuite/Makefile.in
@@ -185,6 +185,8 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CRAY_CPPFLAGS = @CRAY_CPPFLAGS@
CRAY_LDFLAGS = @CRAY_LDFLAGS@
+CRAY_SWITCH_CPPFLAGS = @CRAY_SWITCH_CPPFLAGS@
+CRAY_SWITCH_LDFLAGS = @CRAY_SWITCH_LDFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
diff --git a/testsuite/expect/Makefile.in b/testsuite/expect/Makefile.in
index edf4d72d07224cfed83146339dbaa2d81c44a95f..75463f078b4216622b46554329bea89c82258ada 100644
--- a/testsuite/expect/Makefile.in
+++ b/testsuite/expect/Makefile.in
@@ -138,6 +138,8 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CRAY_CPPFLAGS = @CRAY_CPPFLAGS@
CRAY_LDFLAGS = @CRAY_LDFLAGS@
+CRAY_SWITCH_CPPFLAGS = @CRAY_SWITCH_CPPFLAGS@
+CRAY_SWITCH_LDFLAGS = @CRAY_SWITCH_LDFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
diff --git a/testsuite/slurm_unit/Makefile.in b/testsuite/slurm_unit/Makefile.in
index 32c59e67550823f8921450aacdf597e871ed9433..7dcd0e50a3603213dd204fef30b07f2e09b6984b 100644
--- a/testsuite/slurm_unit/Makefile.in
+++ b/testsuite/slurm_unit/Makefile.in
@@ -178,6 +178,8 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CRAY_CPPFLAGS = @CRAY_CPPFLAGS@
CRAY_LDFLAGS = @CRAY_LDFLAGS@
+CRAY_SWITCH_CPPFLAGS = @CRAY_SWITCH_CPPFLAGS@
+CRAY_SWITCH_LDFLAGS = @CRAY_SWITCH_LDFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
diff --git a/testsuite/slurm_unit/api/Makefile.in b/testsuite/slurm_unit/api/Makefile.in
index 86d0dab533fa89c7e7701434d0f215190728bfd2..eb97070b3ef77c3efceea7e0c7b9ea2563dedeee 100644
--- a/testsuite/slurm_unit/api/Makefile.in
+++ b/testsuite/slurm_unit/api/Makefile.in
@@ -201,6 +201,8 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CRAY_CPPFLAGS = @CRAY_CPPFLAGS@
CRAY_LDFLAGS = @CRAY_LDFLAGS@
+CRAY_SWITCH_CPPFLAGS = @CRAY_SWITCH_CPPFLAGS@
+CRAY_SWITCH_LDFLAGS = @CRAY_SWITCH_LDFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
diff --git a/testsuite/slurm_unit/api/manual/Makefile.in b/testsuite/slurm_unit/api/manual/Makefile.in
index 3671536ee5f465e4ef7a55379c5fa0cd17c10e25..41e3b6c2d2ac9eb039188b89d62f3fa2d122f8f1 100644
--- a/testsuite/slurm_unit/api/manual/Makefile.in
+++ b/testsuite/slurm_unit/api/manual/Makefile.in
@@ -193,6 +193,8 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CRAY_CPPFLAGS = @CRAY_CPPFLAGS@
CRAY_LDFLAGS = @CRAY_LDFLAGS@
+CRAY_SWITCH_CPPFLAGS = @CRAY_SWITCH_CPPFLAGS@
+CRAY_SWITCH_LDFLAGS = @CRAY_SWITCH_LDFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
diff --git a/testsuite/slurm_unit/common/Makefile.in b/testsuite/slurm_unit/common/Makefile.in
index cf7b6dc0fbecc78abbe1a493ebcad4b9dd41ac84..3fc6f31e1cfb4c692bdf0ec759f52482760731ae 100644
--- a/testsuite/slurm_unit/common/Makefile.in
+++ b/testsuite/slurm_unit/common/Makefile.in
@@ -195,6 +195,8 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CRAY_CPPFLAGS = @CRAY_CPPFLAGS@
CRAY_LDFLAGS = @CRAY_LDFLAGS@
+CRAY_SWITCH_CPPFLAGS = @CRAY_SWITCH_CPPFLAGS@
+CRAY_SWITCH_LDFLAGS = @CRAY_SWITCH_LDFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@