Merge branch 'jgfouca/cime/minor_compiler_fixes' (PR #2864)

Minor build fixes

Need consistent case for USE_CXX in Makefile (Restores cxxlib flag for
PIO2). Intel should not add qopenmp unless compile_threaded is TRUE.

Fixes #2858

[BFB]

* origin/jgfouca/cime/minor_compiler_fixes:
  Minor build fixes

config/e3sm/machines/config_compilers.xml

@@ -260,7 +260,8 @@ for mct, etc.
     <append DEBUG="TRUE"> -O0 -g </append>
   </CFLAGS>
   <CXXFLAGS>
-    <base> -std=c++11 -fp-model source -qopenmp </base>
+    <base> -std=c++11 -fp-model source </base>
+    <append compile_threaded="TRUE"> -qopenmp </append>
     <append DEBUG="TRUE"> -O0 -g </append>
     <append DEBUG="FALSE"> -O2 </append>
   </CXXFLAGS>

scripts/Tools/Makefile

@@ -122,7 +122,7 @@ endif
 ifeq ($(strip $(PIO_VERSION)),1)
   CPPDEFS += -DPIO1
 else
-  USE_CXX = true
+  USE_CXX = TRUE
 endif
 
 ifeq (,$(SHAREDPATH))