Fix makefile and re-enable test disabled due to llvm.org/pr15256

- fix is: don't pass incompatible -stdlib option when building with GCC

llvm-svn: 176460

diff --git a/lldb/test/functionalities/data-formatter/data-formatter-skip-summary/Makefile b/lldb/test/functionalities/data-formatter/data-formatter-skip-summary/Makefile
index 41d7906..6b5bcee 100644 (file)
--- a/lldb/test/functionalities/data-formatter/data-formatter-skip-summary/Makefile
+++ b/lldb/test/functionalities/data-formatter/data-formatter-skip-summary/Makefile
@@ -4,5 +4,9 @@ CXX_SOURCES := main.cpp
 
 include $(LEVEL)/Makefile.rules
 
-CXXFLAGS += -stdlib=libstdc++ -O0
+CXXFLAGS += -O0
+
+ifeq (,$(findstring gcc,$(CC)))
+CXXFLAGS += -stdlib=libstdc++
 LDFLAGS += -stdlib=libstdc++
+endif

diff --git a/lldb/test/functionalities/data-formatter/data-formatter-skip-summary/TestDataFormatterSkipSummary.py b/lldb/test/functionalities/data-formatter/data-formatter-skip-summary/TestDataFormatterSkipSummary.py
index 6fe5bf7..baf3f2d 100644 (file)
--- a/lldb/test/functionalities/data-formatter/data-formatter-skip-summary/TestDataFormatterSkipSummary.py
+++ b/lldb/test/functionalities/data-formatter/data-formatter-skip-summary/TestDataFormatterSkipSummary.py
@@ -19,7 +19,6 @@ class SkipSummaryDataFormatterTestCase(TestBase):
         self.buildDsym()
         self.data_formatter_commands()
 
-    @skipOnLinux #PR-15256: assertion failure in RecordLayoutBuilder::updateExternalFieldOffset
     @dwarf_test
     def test_with_dwarf_and_run_command(self):
         """Test data formatter commands."""