diff --git a/cime_config/buildcpp b/cime_config/buildcpp
index fac7dcbf68..09b4fc31a9 100644
--- a/cime_config/buildcpp
+++ b/cime_config/buildcpp
@@ -78,7 +78,13 @@ def buildcpp(case):
 
     if cam_dycore == 'fv3':
          config_opts += ["-fv3core_libdir", os.path.join(exeroot,"atm","obj","atmos_cubed_sphere")]
-
+         try:
+             libs = case.get_values("CASE_SUPPORT_LIBRARIES")
+             if libs is not None and "FMS" not in libs:
+                 libs.extend(["gptl","pio","csm_share","FMS"])
+                 case.set_value("CASE_SUPPORT_LIBRARIES", ",".join(libs))
+         except:
+             pass
     # The ocean component setting is only used by CAM to do attribute matching for
     # setting default tuning parameter values.  In SOM mode we want to use the same
     # tunings as the fully coupled B compset, so set the ocean component to pop in