[Lldb-commits] [lldb] r176460 - Fix makefile and re-enable test disabled due to llvm.org/pr15256

[Daniel Malea]

Author: dmalea
Date: Mon Mar  4 17:04:53 2013
New Revision: 176460

URL: http://llvm.org/viewvc/llvm-project?rev=176460&view=rev
Log:
Fix makefile and re-enable test disabled due to llvm.org/pr15256
- fix is: don't pass incompatible -stdlib option when building with GCC


Modified:
    lldb/trunk/test/functionalities/data-formatter/data-formatter-skip-summary/Makefile
    lldb/trunk/test/functionalities/data-formatter/data-formatter-skip-summary/TestDataFormatterSkipSummary.py

Modified: lldb/trunk/test/functionalities/data-formatter/data-formatter-skip-summary/Makefile
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/data-formatter/data-formatter-skip-summary/Makefile?rev=176460&r1=176459&r2=176460&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/data-formatter/data-formatter-skip-summary/Makefile (original)
+++ lldb/trunk/test/functionalities/data-formatter/data-formatter-skip-summary/Makefile Mon Mar  4 17:04:53 2013
@@ -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

Modified: lldb/trunk/test/functionalities/data-formatter/data-formatter-skip-summary/TestDataFormatterSkipSummary.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/data-formatter/data-formatter-skip-summary/TestDataFormatterSkipSummary.py?rev=176460&r1=176459&r2=176460&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/data-formatter/data-formatter-skip-summary/TestDataFormatterSkipSummary.py (original)
+++ lldb/trunk/test/functionalities/data-formatter/data-formatter-skip-summary/TestDataFormatterSkipSummary.py Mon Mar  4 17:04:53 2013
@@ -19,7 +19,6 @@ class SkipSummaryDataFormatterTestCase(T
         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."""