[Make] Revert some changes from r372795.

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

llvm-svn: 372801

Author: JDevlieghere

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

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