diff options
| author | Jonas Devlieghere <jonas@devlieghere.com> | 2019-09-25 01:39:13 +0000 |
|---|---|---|
| committer | Jonas Devlieghere <jonas@devlieghere.com> | 2019-09-25 01:39:13 +0000 |
| commit | 03f2a11cf7431dde72763902d1b2fc972ea4e8df (patch) | |
| tree | b95219c47bdb82c50808da0115d1abd94b58e8e4 /lldb/packages/Python/lldbsuite | |
| parent | 4d4a8eed065a4debb97c262c0ee5f1958b234aaa (diff) | |
| download | bcm5719-llvm-03f2a11cf7431dde72763902d1b2fc972ea4e8df.tar.gz bcm5719-llvm-03f2a11cf7431dde72763902d1b2fc972ea4e8df.zip | |
[Make] Revert some changes from r372795.
These changes cause the corresponding test to fail on the Linux bots.
llvm-svn: 372801
Diffstat (limited to 'lldb/packages/Python/lldbsuite')
| -rw-r--r-- | lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/sysroot/Makefile | 2 | ||||
| -rw-r--r-- | lldb/packages/Python/lldbsuite/test/functionalities/dead-strip/Makefile | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/sysroot/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/sysroot/Makefile index 019a94d53a9..e7b3bdb33d7 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/sysroot/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/sysroot/Makefile @@ -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 diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/dead-strip/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/dead-strip/Makefile index 4ce23f6b0fb..c39b681d187 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/dead-strip/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/dead-strip/Makefile @@ -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 |
