Index: Makefile.in
===================================================================
--- Makefile.in	(revision 122065)
+++ Makefile.in	(working copy)
@@ -429,7 +429,7 @@ xmake_file=@xmake_file@
 tmake_file=@tmake_file@
 out_file=$(srcdir)/config/@out_file@
 # APPLE LOCAL LLVM
-out_cxx_file=$(srcdir)/config/@out_cxx_file@
+out_cxx_file=@out_cxx_file@
 out_object_file=@out_object_file@
 # APPLE LOCAL LLVM
 out_cxx_object_file=@out_cxx_object_file@
@@ -1023,8 +1023,12 @@ OBJS-common = \
  lambda-trans.o	lambda-code.o tree-loop-linear.o
 # APPLE LOCAL end lno, loops-to-memset
 
-# APPLE LOCAL LLVM
-OBJS-md = $(out_object_file) $(out_cxx_object_file)
+OBJS-md = $(out_object_file)
+# APPLE LOCAL begin LLVM
+ifneq ($(out_cxx_file),)
+OBJC-md += $(out_cxx_object_file)
+endif
+# APPLE LOCAL end LLVM
 OBJS-archive = $(EXTRA_OBJS) $(host_hook_obj) tree-inline.o		   \
   cgraph.o cgraphunit.o tree-nomudflap.o
 
@@ -1114,9 +1118,12 @@ endif
 endif
 # APPLE LOCAL end LLVM
 
-# APPLE LOCAL LLVM
-OBJS = $(OBJS-common) $(out_object_file) $(OBJS-archive) $(out_cxx_object_file)
-
+OBJS = $(OBJS-common) $(out_object_file) $(OBJS-archive)
+# APPLE LOCAL begin LLVM
+ifneq ($(out_cxx_file),)
+OBJS += $(out_cxx_object_file)
+endif
+# APPLE LOCAL end LLVM
 OBJS-onestep = libbackend.o $(OBJS-archive)
 
 # APPLE LOCAL begin LLVM
@@ -2472,13 +2479,15 @@ $(out_object_file): $(out_file) $(CONFIG
 	$(CC) -c $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) \
 		$(out_file) $(OUTPUT_OPTION)
 # APPLE LOCAL begin LLVM
-$(out_cxx_object_file): $(out_cxx_file) $(CONFIG_H) coretypes.h $(TM_H) $(TREE_H) $(GGC_H) \
+ifneq ($(out_cxx_file),)
+$(out_cxx_object_file): $(srcdir)/config/$(out_cxx_file) $(CONFIG_H) coretypes.h $(TM_H) $(TREE_H) $(GGC_H) \
    $(RTL_H) $(REGS_H) hard-reg-set.h real.h insn-config.h conditions.h \
    output.h $(INSN_ATTR_H) $(SYSTEM_H) toplev.h $(TARGET_H) libfuncs.h \
    $(TARGET_DEF_H) function.h $(SCHED_INT_H) $(TM_P_H) $(EXPR_H) $(OPTABS_H) \
    langhooks.h
 	$(CXX) -c $(ALL_CXXFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) \
-		$(out_cxx_file) $(OUTPUT_OPTION)
+		$(srcdir)/config/$(out_cxx_file) $(OUTPUT_OPTION)
+endif
 # APPLE LOCAL end  LLVM
 
 # Build auxiliary files that support ecoff format.