diff --git a/configure/CONFIG_COMMON b/configure/CONFIG_COMMON
index 80e22c963..b627c58f2 100644
--- a/configure/CONFIG_COMMON
+++ b/configure/CONFIG_COMMON
@@ -164,11 +164,6 @@ LIBRARY_LD_RESS = $(TARGET_RESS) $(LIBRARY_RESS)
 PROD_BAF = $(addsuffix $(BAF), $(basename $(PROD)))
 LIB_BAF=$(addsuffix $(BAF),$(basename $(LIBRARY)))
 
-#--------------------------------------------------
-#  Command-line input support default
-COMMANDLINE_LIBRARY = EPICS
-OP_SYS_LDLIBS += $(LDLIBS_$(COMMANDLINE_LIBRARY))
-
 #--------------------------------------------------
 # C preprocessor, compiler, and linker flag defaults
 
@@ -217,7 +212,7 @@ TARGET_CPPFLAGS += $($(basename $@)_CPPFLAGS_$(OS_CLASS)) $($(basename $@)_CPPFL
 # Level of ansi conformance flags
 CONFORM_CPPFLAGS = $(CONFORM_CPPFLAGS_$(CMPLR))
 CONFORM_CFLAGS = $(CONFORM_CFLAGS_$(CMPLR))
-CONFORM_CXXFLAGS = $(CONFORM_CXXFLAGS_CMPLR))
+CONFORM_CXXFLAGS = $(CONFORM_CXXFLAGS_$(CMPLR))
 
 # Warnings flags
 WARN_CFLAGS = $(WARN_CFLAGS_$($(BUILD_CLASS)_WARN))
@@ -238,6 +233,11 @@ STATIC_CXXCFLAGS = $(STATIC_CXXFLAGS_$(STATIC_BUILD))
 STATIC_LDFLAGS = $(STATIC_LDFLAGS_$(STATIC_BUILD))
 STATIC_LDLIBS = $(STATIC_LDLIBS_$(STATIC_BUILD))
 
+#--------------------------------------------------
+#  Command-line input support default
+COMMANDLINE_LIBRARY = EPICS
+OP_SYS_LDLIBS += $(LDLIBS_$(COMMANDLINE_LIBRARY))
+
 #--------------------------------------------------
 # Flags