diff --git a/makefiles/BuildCorba.gmk b/makefiles/BuildCorba.gmk
index 1e1ab5c1c7e6c7bbebca3e5b6a5cf36301a6e4e0..b55a8321852df53707fa513642887f6349eab36e 100644
--- a/makefiles/BuildCorba.gmk
+++ b/makefiles/BuildCorba.gmk
@@ -45,8 +45,9 @@ DISABLE_CORBA_WARNINGS:=-Xlint:all,-deprecation,-unchecked,-serial,-fallthrough,
 $(eval $(call SetupJavaCompiler,GENERATE_OLDBYTECODE,\
      JVM:=$(JAVA),\
      JAVAC:=$(NEW_JAVAC),\
-    FLAGS := $(BOOT_JDK_SOURCETARGET) -bootclasspath $(BOOT_RTJAR)$(PATH_SEP)$(BOOT_TOOLSJAR) \
-        $(DISABLE_CORBA_WARNINGS), \
+     FLAGS := $(BOOT_JDK_SOURCETARGET) \
+          -bootclasspath "$(BOOT_RTJAR)$(PATH_SEP)$(BOOT_TOOLSJAR)" \
+          $(DISABLE_CORBA_WARNINGS), \
      SERVER_DIR:=$(SJAVAC_SERVER_DIR),\
      SERVER_JVM:=$(SJAVAC_SERVER_JAVA)))