Author: jdevlieghere
Date: Tue Sep 24 18:39:13 2019
New Revision: 372801
URL: http://llvm.org/viewvc/llvm-project?rev=372801&view=rev
Log:
[Make] Revert some changes from r372795.
These changes cause the corresponding test to fail on the Linux bots.
Modified:
lldb/trunk/packages/Python/lldbsuite/test/commands/expression/import-std-module/sysroot/Makefile
lldb/trunk/packages/Python/lldbsuite/test/functionalities/dead-strip/Makefile
Modified:
lldb/trunk/packages/Python/lldbsuite/test/commands/expression/import-std-module/sysroot/Makefile
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/commands/expression/import-std-module/sysroot/Makefile?rev=372801&r1=372800&r2=372801&view=diff
==============================================================================
---
lldb/trunk/packages/Python/lldbsuite/test/commands/expression/import-std-module/sysroot/Makefile
(original)
+++
lldb/trunk/packages/Python/lldbsuite/test/commands/expression/import-std-module/sysroot/Makefile
Tue Sep 24 18:39:13 2019
@@ -3,7 +3,7 @@
# system headers.
NO_TEST_COMMON_H := 1
-CXXFLAGS_EXTRAS := -I $(SRCDIR)/root/usr/include/c++/include/ -I
$(SRCDIR)/root/usr/include/ -nostdinc -nostdinc++ -nostdlib++
+CXXFLAGS += -I $(SRCDIR)/root/usr/include/c++/include/ -I
$(SRCDIR)/root/usr/include/ -nostdinc -nostdinc++ -nostdlib++
CXX_SOURCES := main.cpp
include Makefile.rules
Modified:
lldb/trunk/packages/Python/lldbsuite/test/functionalities/dead-strip/Makefile
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/dead-strip/Makefile?rev=372801&r1=372800&r2=372801&view=diff
==============================================================================
---
lldb/trunk/packages/Python/lldbsuite/test/functionalities/dead-strip/Makefile
(original)
+++
lldb/trunk/packages/Python/lldbsuite/test/functionalities/dead-strip/Makefile
Tue Sep 24 18:39:13 2019
@@ -5,10 +5,10 @@ ifeq "$(OS)" ""
endif
ifeq "$(OS)" "Darwin"
- LD_EXTRAS := -Xlinker -dead_strip
+ LDFLAGS = $(CFLAGS) -Xlinker -dead_strip
else
- CFLAGS_EXTRAS := -fdata-sections -ffunction-sections
- LD_EXTRAS := -Wl,--gc-sections
+ CFLAGS += -fdata-sections -ffunction-sections
+ LDFLAGS = $(CFLAGS) -Wl,--gc-sections
endif
MAKE_DSYM := NO
_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
