From 03f2a11cf7431dde72763902d1b2fc972ea4e8df Mon Sep 17 00:00:00 2001
From: Jonas Devlieghere <jonas@devlieghere.com>
Date: Wed, 25 Sep 2019 01:39:13 +0000
Subject: [PATCH] [Make] Revert some changes from r372795.

These changes cause the corresponding test to fail on the Linux bots.

llvm-svn: 372801
---
 .../commands/expression/import-std-module/sysroot/Makefile  | 2 +-
 .../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 019a94d53a96f7..e7b3bdb33d7bf8 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 4ce23f6b0fbe31..c39b681d18704f 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