Index: expression_command/call-function/Makefile
===================================================================
--- expression_command/call-function/Makefile
+++ expression_command/call-function/Makefile
@@ -6,7 +6,7 @@
 # targets.  Other targets do not, which causes this test to fail.
 # This flag enables FullDebugInfo for all targets.
 ifneq (,$(findstring clang,$(CC)))
-  CFLAGS_EXTRAS := -fstandalone-debug
+  CFLAGS_EXTRAS := -fno-limit-debug-info
 endif
 
 include $(LEVEL)/Makefile.rules
Index: functionalities/data-formatter/data-formatter-skip-summary/Makefile
===================================================================
--- functionalities/data-formatter/data-formatter-skip-summary/Makefile
+++ functionalities/data-formatter/data-formatter-skip-summary/Makefile
@@ -6,7 +6,7 @@
 # targets.  Other targets do not, which causes this test to fail.
 # This flag enables FullDebugInfo for all targets.
 ifneq (,$(findstring clang,$(CC)))
-  CFLAGS_EXTRAS := -fstandalone-debug
+  CFLAGS_EXTRAS := -fno-limit-debug-info
 endif
 
 include $(LEVEL)/Makefile.rules
Index: functionalities/data-formatter/data-formatter-stl/libstdcpp/iterator/Makefile
===================================================================
--- functionalities/data-formatter/data-formatter-stl/libstdcpp/iterator/Makefile
+++ functionalities/data-formatter/data-formatter-stl/libstdcpp/iterator/Makefile
@@ -9,7 +9,7 @@
 # targets.  Other targets do not, which causes this test to fail.
 # This flag enables FullDebugInfo for all targets.
 ifneq (,$(findstring clang,$(CC)))
-  CFLAGS_EXTRAS := -fstandalone-debug
+  CFLAGS_EXTRAS := -fno-limit-debug-info
 endif
 
 include $(LEVEL)/Makefile.rules
Index: functionalities/data-formatter/data-formatter-stl/libstdcpp/list/Makefile
===================================================================
--- functionalities/data-formatter/data-formatter-stl/libstdcpp/list/Makefile
+++ functionalities/data-formatter/data-formatter-stl/libstdcpp/list/Makefile
@@ -9,7 +9,7 @@
 # targets.  Other targets do not, which causes this test to fail.
 # This flag enables FullDebugInfo for all targets.
 ifneq (,$(findstring clang,$(CC)))
-  CFLAGS_EXTRAS += -fstandalone-debug
+  CFLAGS_EXTRAS += -fno-limit-debug-info
 endif
 
 include $(LEVEL)/Makefile.rules
Index: functionalities/data-formatter/data-formatter-stl/libstdcpp/string/Makefile
===================================================================
--- functionalities/data-formatter/data-formatter-stl/libstdcpp/string/Makefile
+++ functionalities/data-formatter/data-formatter-stl/libstdcpp/string/Makefile
@@ -9,7 +9,7 @@
 # targets.  Other targets do not, which causes this test to fail.
 # This flag enables FullDebugInfo for all targets.
 ifneq (,$(findstring clang,$(CC)))
-  CFLAGS_EXTRAS += -fstandalone-debug
+  CFLAGS_EXTRAS += -fno-limit-debug-info
 endif
 
 include $(LEVEL)/Makefile.rules
Index: functionalities/data-formatter/data-formatter-synth/Makefile
===================================================================
--- functionalities/data-formatter/data-formatter-synth/Makefile
+++ functionalities/data-formatter/data-formatter-synth/Makefile
@@ -6,7 +6,7 @@
 # targets.  Other targets do not, which causes this test to fail.
 # This flag enables FullDebugInfo for all targets.
 ifneq (,$(findstring clang,$(CC)))
-  CFLAGS_EXTRAS := -fstandalone-debug
+  CFLAGS_EXTRAS := -fno-limit-debug-info
 endif
 
 include $(LEVEL)/Makefile.rules
Index: functionalities/data-formatter/rdar-9974002/Makefile
===================================================================
--- functionalities/data-formatter/rdar-9974002/Makefile
+++ functionalities/data-formatter/rdar-9974002/Makefile
@@ -6,7 +6,7 @@
 # targets.  Other targets do not, which causes this test to fail.
 # This flag enables FullDebugInfo for all targets.
 ifneq (,$(findstring clang,$(CC)))
-  CFLAGS_EXTRAS := -fstandalone-debug
+  CFLAGS_EXTRAS := -fno-limit-debug-info
 endif
 
 include $(LEVEL)/Makefile.rules
Index: functionalities/data-formatter/stringprinter/Makefile
===================================================================
--- functionalities/data-formatter/stringprinter/Makefile
+++ functionalities/data-formatter/stringprinter/Makefile
@@ -6,7 +6,7 @@
 # targets.  Other targets do not, which causes this test to fail.
 # This flag enables FullDebugInfo for all targets.
 ifneq (,$(findstring clang,$(CC)))
-  CFLAGS_EXTRAS := -fstandalone-debug
+  CFLAGS_EXTRAS := -fno-limit-debug-info
 endif
 
 include $(LEVEL)/Makefile.rules
Index: functionalities/type_completion/Makefile
===================================================================
--- functionalities/type_completion/Makefile
+++ functionalities/type_completion/Makefile
@@ -6,7 +6,7 @@
 # targets.  Other targets do not, which causes this test to fail.
 # This flag enables FullDebugInfo for all targets.
 ifneq (,$(findstring clang,$(CC)))
-  CFLAGS_EXTRAS += -fstandalone-debug
+  CFLAGS_EXTRAS += -fno-limit-debug-info
 endif
 
 include $(LEVEL)/Makefile.rules
Index: lang/cpp/stl/Makefile
===================================================================
--- lang/cpp/stl/Makefile
+++ lang/cpp/stl/Makefile
@@ -9,7 +9,7 @@
 # targets.  Other targets do not, which causes this test to fail.
 # This flag enables FullDebugInfo for all targets.
 ifneq (,$(findstring clang,$(CC)))
-  CFLAGS_EXTRAS := -fstandalone-debug
+  CFLAGS_EXTRAS := -fno-limit-debug-info
 endif
 
 include $(LEVEL)/Makefile.rules
Index: python_api/sbvalue_persist/Makefile
===================================================================
--- python_api/sbvalue_persist/Makefile
+++ python_api/sbvalue_persist/Makefile
@@ -9,7 +9,7 @@
 # targets.  Other targets do not, which causes this test to fail.
 # This flag enables FullDebugInfo for all targets.
 ifneq (,$(findstring clang,$(CC)))
-  CFLAGS_EXTRAS := -fstandalone-debug
+  CFLAGS_EXTRAS := -fno-limit-debug-info
 endif
 
 include $(LEVEL)/Makefile.rules