Author: Pavel Labath Date: 2020-06-10T14:27:53+02:00 New Revision: 539b47c9d1edd3b152efc9073f6729f28cf48d9a
URL: https://github.com/llvm/llvm-project/commit/539b47c9d1edd3b152efc9073f6729f28cf48d9a DIFF: https://github.com/llvm/llvm-project/commit/539b47c9d1edd3b152efc9073f6729f28cf48d9a.diff LOG: [lldb/Makefile.rules] Apply CFLAGS_EXTRAS after debug-info mode flags This makes it possible to conditionally override some of these flags via CFLAGS_EXTRAS. It should be NFC right now, but this seems the logical order in which to apply these things, and I am going to make use of this in another patch. Added: Modified: lldb/packages/Python/lldbsuite/test/make/Makefile.rules Removed: ################################################################################ diff --git a/lldb/packages/Python/lldbsuite/test/make/Makefile.rules b/lldb/packages/Python/lldbsuite/test/make/Makefile.rules index ea0fa748bc36..554d32007e64 100644 --- a/lldb/packages/Python/lldbsuite/test/make/Makefile.rules +++ b/lldb/packages/Python/lldbsuite/test/make/Makefile.rules @@ -295,7 +295,7 @@ ifndef NO_TEST_COMMON_H CFLAGS += -include $(THIS_FILE_DIR)/test_common.h endif -CFLAGS += $(NO_LIMIT_DEBUG_INFO_FLAGS) $(ARCH_CFLAGS) $(CFLAGS_EXTRAS) +CFLAGS += $(NO_LIMIT_DEBUG_INFO_FLAGS) $(ARCH_CFLAGS) # If the OS is Windows, we need to pass -gdwarf to clang, otherwise it will build # with codeview by default but all the tests rely on dwarf. @@ -335,6 +335,7 @@ ifeq "$(MAKE_GMODULES)" "YES" CXXFLAGS += $(MANDATORY_MODULE_BUILD_CFLAGS) endif +CFLAGS += $(CFLAGS_EXTRAS) CXXFLAGS += -std=c++11 $(CFLAGS) $(ARCH_CXXFLAGS) $(CXXFLAGS_EXTRAS) LD = $(CC) LDFLAGS ?= $(CFLAGS) _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
