diff options
| author | Jordan Rupprecht <rupprecht@google.com> | 2019-12-05 15:48:34 -0800 |
|---|---|---|
| committer | Jordan Rupprecht <rupprecht@google.com> | 2019-12-05 15:50:03 -0800 |
| commit | 0d236d8b4f8aecc258e26ad53755a39d9b76032e (patch) | |
| tree | 0a9f9e5e84d65d3119fcd7ca0bcb06584e6d368b | |
| parent | fdf80e86a52849813d05da4b6c25884c06ba9e98 (diff) | |
| download | bcm5719-llvm-0d236d8b4f8aecc258e26ad53755a39d9b76032e.tar.gz bcm5719-llvm-0d236d8b4f8aecc258e26ad53755a39d9b76032e.zip | |
[lldb] Update hardcoded Makefile.rules inclusions.
This replaces `include $(LEVEL)/Makefile.rules` with `include Makefile.rules`.
The lldb test driver already passes the include path when running make, and specifically looking for "../../Makefile.rules" forces the test to be in a specific location.
Removing this hardcoded relative path will make it possible to move this test as-is.
4 files changed, 3 insertions, 9 deletions
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/float-display/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/float-display/Makefile index f5a47fcc46c..c9319d6e688 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/float-display/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/float-display/Makefile @@ -1,3 +1,2 @@ -LEVEL = ../../make C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/param_entry_vals/basic_entry_values_x86_64/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/param_entry_vals/basic_entry_values_x86_64/Makefile index a49ffa84c54..db8fa57abb9 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/param_entry_vals/basic_entry_values_x86_64/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/param_entry_vals/basic_entry_values_x86_64/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules CXXFLAGS_EXTRAS := -O2 -glldb -Xclang -femit-debug-entry-values include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/thread_local/Makefile b/lldb/packages/Python/lldbsuite/test/lang/cpp/thread_local/Makefile index 99bfa7e03b4..3d0b98f13f3 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/cpp/thread_local/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/thread_local/Makefile @@ -1,3 +1,2 @@ -LEVEL = ../../../make CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/macosx/macabi/Makefile b/lldb/packages/Python/lldbsuite/test/macosx/macabi/Makefile index 61e3337e1d9..2123af1dd70 100644 --- a/lldb/packages/Python/lldbsuite/test/macosx/macabi/Makefile +++ b/lldb/packages/Python/lldbsuite/test/macosx/macabi/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../make - C_SOURCES := main.c LD_EXTRAS := -L. -lfoo @@ -12,4 +10,4 @@ libfoo.dylib: foo.c $(MAKE) -f $(MAKEFILE_RULES) \ DYLIB_ONLY=YES DYLIB_NAME=foo DYLIB_C_SOURCES=foo.c -include $(LEVEL)/Makefile.rules +include Makefile.rules |
