From 418a272f4ab4221c37a9272d48fd31d5ac1bddc1 Mon Sep 17 00:00:00 2001 From: Pavel Labath Date: Wed, 4 Sep 2019 07:46:25 +0000 Subject: [PATCH] [dotest] Avoid the need for LEVEL= makefile boilerplate Summary: Instead of each test case knowing its depth relative to the test root, we can just have dotest add the folder containing Makefile.rules to the include path. This was motivated by r370616, though I have been wanting to do this ever since we moved to building tests out-of-tree. The only manually modified files in this patch are lldbinline.py and plugins/builder_base.py. The rest of the patch has been produced by this shell command: find . \( -name Makefile -o -name '*.mk' \) -exec sed --in-place -e '/LEVEL *:\?=/d' -e '1,2{/^$/d}' -e 's,\$(LEVEL)/,,' {} + Reviewers: teemperor, aprantl, espindola, jfb Subscribers: emaste, javed.absar, arichardson, christof, arphaman, lldb-commits Differential Revision: https://reviews.llvm.org/D67083 llvm-svn: 370845 --- lldb/packages/Python/lldbsuite/test/Makefile | 1 - .../Python/lldbsuite/test/android/platform/Makefile | 4 +--- .../lldbsuite/test/api/check_public_api_headers/Makefile | 4 +--- lldb/packages/Python/lldbsuite/test/api/listeners/Makefile | 4 +--- .../Python/lldbsuite/test/api/multiple-debuggers/Makefile | 4 +--- .../Python/lldbsuite/test/api/multiple-targets/Makefile | 4 +--- .../Python/lldbsuite/test/api/multithreaded/Makefile | 4 +--- .../Python/lldbsuite/test/arm/breakpoint-it/Makefile | 4 +--- .../test/arm/breakpoint-thumb-codesection/Makefile | 4 +--- .../Python/lldbsuite/test/benchmarks/continue/Makefile | 4 +--- .../Python/lldbsuite/test/benchmarks/expression/Makefile | 4 +--- .../Python/lldbsuite/test/benchmarks/libcxxlist/Makefile | 4 +--- .../Python/lldbsuite/test/benchmarks/libcxxmap/Makefile | 4 +--- .../Python/lldbsuite/test/commands/add-dsym/uuid/Makefile | 4 +--- .../lldbsuite/test/commands/apropos/with-process/Makefile | 4 +--- .../lldbsuite/test/commands/breakpoint/basic/Makefile | 4 +--- .../lldbsuite/test/commands/command/nested_alias/Makefile | 4 +--- .../Python/lldbsuite/test/commands/command/script/Makefile | 4 +--- .../lldbsuite/test/commands/command/script/import/Makefile | 4 +--- .../commands/command/script/import/rdar-12586188/Makefile | 4 +--- .../lldbsuite/test/commands/disassemble/basic/Makefile | 4 +--- .../test/commands/expression/anonymous-struct/Makefile | 4 +--- .../expression/argument_passing_restrictions/Makefile | 4 +--- .../test/commands/expression/call-function/Makefile | 4 +--- .../commands/expression/call-overridden-method/Makefile | 4 +--- .../test/commands/expression/call-restarts/Makefile | 4 +--- .../test/commands/expression/call-throws/Makefile | 4 +--- .../expression/cast_int_to_anonymous_enum/Makefile | 4 +--- .../lldbsuite/test/commands/expression/char/Makefile | 4 +--- .../class_template_specialization_empty_pack/Makefile | 4 +--- .../expression/completion-crash-incomplete-record/Makefile | 3 +-- .../commands/expression/completion-crash-lambda/Makefile | 3 +-- .../test/commands/expression/completion-crash1/Makefile | 3 +-- .../test/commands/expression/completion-crash2/Makefile | 3 +-- .../lldbsuite/test/commands/expression/completion/Makefile | 4 +--- .../test/commands/expression/context-object-objc/Makefile | 4 +--- .../test/commands/expression/context-object/Makefile | 4 +--- .../test/commands/expression/dollar-in-variable/Makefile | 3 +-- .../test/commands/expression/dont_allow_jit/Makefile | 4 +--- .../lldbsuite/test/commands/expression/entry-bp/Makefile | 4 +--- .../test/commands/expression/expr-in-syscall/Makefile | 4 +--- .../lldbsuite/test/commands/expression/fixits/Makefile | 4 +--- .../lldbsuite/test/commands/expression/formatters/Makefile | 4 +--- .../function_template_specialization_temp_args/Makefile | 4 +--- .../commands/expression/import-std-module/basic/Makefile | 3 +-- .../expression/import-std-module/conflicts/Makefile | 3 +-- .../expression/import-std-module/deque-basic/Makefile | 3 +-- .../import-std-module/deque-dbg-info-content/Makefile | 3 +-- .../import-std-module/forward_list-basic/Makefile | 3 +-- .../forward_list-dbg-info-content/Makefile | 3 +-- .../expression/import-std-module/list-basic/Makefile | 3 +-- .../import-std-module/list-dbg-info-content/Makefile | 3 +-- .../expression/import-std-module/no-std-module/Makefile | 3 +-- .../commands/expression/import-std-module/queue/Makefile | 3 +-- .../import-std-module/shared_ptr-dbg-info-content/Makefile | 3 +-- .../expression/import-std-module/shared_ptr/Makefile | 3 +-- .../commands/expression/import-std-module/stack/Makefile | 3 +-- .../commands/expression/import-std-module/sysroot/Makefile | 3 +-- .../import-std-module/unique_ptr-dbg-info-content/Makefile | 3 +-- .../expression/import-std-module/unique_ptr/Makefile | 3 +-- .../expression/import-std-module/vector-basic/Makefile | 3 +-- .../expression/import-std-module/vector-bool/Makefile | 3 +-- .../import-std-module/vector-dbg-info-content/Makefile | 3 +-- .../import-std-module/vector-of-vectors/Makefile | 3 +-- .../import-std-module/weak_ptr-dbg-info-content/Makefile | 3 +-- .../expression/import-std-module/weak_ptr/Makefile | 3 +-- .../commands/expression/import_builtin_fileid/Makefile | 4 +--- .../test/commands/expression/inline-namespace/Makefile | 4 +--- .../commands/expression/ir-interpreter-phi-nodes/Makefile | 3 +-- .../test/commands/expression/ir-interpreter/Makefile | 4 +--- .../test/commands/expression/issue_11588/Makefile | 4 +--- .../lldbsuite/test/commands/expression/macros/Makefile | 4 +--- .../test/commands/expression/multiline-completion/Makefile | 3 +-- .../namespace_local_var_same_name_cpp_and_c/Makefile | 4 +--- .../namespace_local_var_same_name_obj_c/Makefile | 3 +-- .../test/commands/expression/no-deadlock/Makefile | 4 +--- .../lldbsuite/test/commands/expression/options/Makefile | 4 +--- .../commands/expression/persist_objc_pointeetype/Makefile | 4 +--- .../commands/expression/persistent_ptr_update/Makefile | 4 +--- .../test/commands/expression/persistent_types/Makefile | 4 +--- .../test/commands/expression/persistent_variables/Makefile | 4 +--- .../test/commands/expression/po_verbosity/Makefile | 4 +--- .../lldbsuite/test/commands/expression/pr35310/Makefile | 4 +--- .../test/commands/expression/radar_8638051/Makefile | 4 +--- .../test/commands/expression/radar_9531204/Makefile | 4 +--- .../test/commands/expression/radar_9673664/Makefile | 4 +--- .../test/commands/expression/rdar42038760/Makefile | 3 +-- .../test/commands/expression/rdar44436068/Makefile | 3 +-- .../test/commands/expression/save_jit_objects/Makefile | 4 +--- .../test/commands/expression/scoped_enums/Makefile | 4 +--- .../lldbsuite/test/commands/expression/test/Makefile | 4 +--- .../lldbsuite/test/commands/expression/timeout/Makefile | 4 +--- .../lldbsuite/test/commands/expression/top-level/Makefile | 4 +--- .../lldbsuite/test/commands/expression/top-level/dummy.mk | 4 +--- .../lldbsuite/test/commands/expression/two-files/Makefile | 4 +--- .../test/commands/expression/unicode-in-variable/Makefile | 3 +-- .../test/commands/expression/unwind_expression/Makefile | 4 +--- .../test/commands/expression/vector_of_enums/Makefile | 4 +--- .../test/commands/expression/weak_symbols/Makefile | 3 +-- .../lldbsuite/test/commands/expression/xvalue/Makefile | 4 +--- .../lldbsuite/test/commands/frame/diagnose/array/Makefile | 4 +--- .../test/commands/frame/diagnose/bad-reference/Makefile | 4 +--- .../frame/diagnose/complicated-expression/Makefile | 4 +--- .../commands/frame/diagnose/dereference-argument/Makefile | 4 +--- .../frame/diagnose/dereference-function-return/Makefile | 4 +--- .../test/commands/frame/diagnose/dereference-this/Makefile | 4 +--- .../test/commands/frame/diagnose/inheritance/Makefile | 4 +--- .../test/commands/frame/diagnose/local-variable/Makefile | 4 +--- .../commands/frame/diagnose/virtual-method-call/Makefile | 4 +--- .../Python/lldbsuite/test/commands/frame/language/Makefile | 4 +--- .../lldbsuite/test/commands/frame/recognizer/Makefile | 4 +--- .../Python/lldbsuite/test/commands/frame/select/Makefile | 3 +-- .../lldbsuite/test/commands/frame/var-scope/Makefile | 3 +-- .../Python/lldbsuite/test/commands/frame/var/Makefile | 4 +--- .../Python/lldbsuite/test/commands/gui/basic/Makefile | 3 +-- .../Python/lldbsuite/test/commands/log/basic/Makefile | 4 +--- .../lldbsuite/test/commands/process/attach-resume/Makefile | 4 +--- .../Python/lldbsuite/test/commands/process/attach/Makefile | 4 +--- .../test/commands/process/attach/attach_denied/Makefile | 4 +--- .../test/commands/process/launch-with-shellexpand/Makefile | 4 +--- .../Python/lldbsuite/test/commands/process/launch/Makefile | 4 +--- .../register/register/intel_xtended_registers/Makefile | 4 +--- .../intel_xtended_registers/mpx_bound_violation/Makefile | 4 +--- .../commands/register/register/register_command/Makefile | 4 +--- .../Python/lldbsuite/test/commands/settings/Makefile | 4 +--- .../lldbsuite/test/commands/settings/quoting/Makefile | 4 +--- .../Python/lldbsuite/test/commands/source/info/Makefile | 3 +-- .../lldbsuite/test/commands/statistics/basic/Makefile | 3 +-- .../Python/lldbsuite/test/commands/target/basic/Makefile | 4 +--- .../lldbsuite/test/commands/target/create-deps/Makefile | 4 +--- .../Python/lldbsuite/test/commands/target/create-deps/a.mk | 4 +--- .../test/commands/target/create-no-such-arch/Makefile | 4 +--- .../lldbsuite/test/commands/target/stop-hooks/Makefile | 4 +--- .../test/commands/watchpoints/hello_watchlocation/Makefile | 4 +--- .../test/commands/watchpoints/hello_watchpoint/Makefile | 4 +--- .../commands/watchpoints/multi_watchpoint_slots/Makefile | 4 +--- .../test/commands/watchpoints/multiple_hits/Makefile | 4 +--- .../test/commands/watchpoints/multiple_threads/Makefile | 4 +--- .../commands/watchpoints/step_over_watchpoint/Makefile | 4 +--- .../commands/watchpoints/variable_out_of_scope/Makefile | 4 +--- .../test/commands/watchpoints/watchpoint_commands/Makefile | 4 +--- .../watchpoints/watchpoint_commands/command/Makefile | 4 +--- .../watchpoints/watchpoint_commands/condition/Makefile | 4 +--- .../test/commands/watchpoints/watchpoint_disable/Makefile | 4 +--- .../test/commands/watchpoints/watchpoint_events/Makefile | 4 +--- .../commands/watchpoints/watchpoint_on_vectors/Makefile | 4 +--- .../commands/watchpoints/watchpoint_set_command/Makefile | 4 +--- .../test/commands/watchpoints/watchpoint_size/Makefile | 4 +--- .../Python/lldbsuite/test/driver/batch_mode/Makefile | 4 +--- .../lldbsuite/test/functionalities/archives/Makefile | 4 +--- .../Python/lldbsuite/test/functionalities/asan/Makefile | 4 +--- .../lldbsuite/test/functionalities/avoids-fd-leak/Makefile | 4 +--- .../lldbsuite/test/functionalities/completion/Makefile | 4 +--- .../test/functionalities/conditional_break/Makefile | 4 +--- .../test/functionalities/darwin_log/basic/Makefile | 4 +--- .../darwin_log/filter/exact_match/activity-chain/Makefile | 4 +--- .../darwin_log/filter/exact_match/activity/Makefile | 4 +--- .../darwin_log/filter/exact_match/category/Makefile | 4 +--- .../darwin_log/filter/exact_match/message/Makefile | 4 +--- .../darwin_log/filter/exact_match/subsystem/Makefile | 4 +--- .../darwin_log/filter/regex/activity-chain/Makefile | 4 +--- .../darwin_log/filter/regex/activity/Makefile | 4 +--- .../darwin_log/filter/regex/category/Makefile | 4 +--- .../darwin_log/filter/regex/message/Makefile | 4 +--- .../darwin_log/filter/regex/subsystem/Makefile | 4 +--- .../test/functionalities/darwin_log/format/Makefile | 4 +--- .../test/functionalities/darwin_log/source/debug/Makefile | 4 +--- .../test/functionalities/darwin_log/source/info/Makefile | 4 +--- .../functionalities/data-formatter/boolreference/Makefile | 4 +--- .../functionalities/data-formatter/compactvectors/Makefile | 4 +--- .../data-formatter/data-formatter-advanced/Makefile | 4 +--- .../data-formatter/data-formatter-categories/Makefile | 4 +--- .../data-formatter/data-formatter-cpp/Makefile | 4 +--- .../data-formatter/data-formatter-disabling/Makefile | 4 +--- .../data-formatter/data-formatter-enum-format/Makefile | 4 +--- .../data-formatter/data-formatter-globals/Makefile | 4 +--- .../data-formatter/data-formatter-named-summaries/Makefile | 4 +--- .../data-formatter/data-formatter-objc/Makefile | 4 +--- .../data-formatter-objc/nsindexpath/Makefile | 4 +--- .../data-formatter/data-formatter-objc/nsstring/Makefile | 4 +--- .../data-formatter/data-formatter-proper-plurals/Makefile | 4 +--- .../data-formatter/data-formatter-ptr-to-array/Makefile | 4 +--- .../data-formatter/data-formatter-python-synth/Makefile | 4 +--- .../data-formatter/data-formatter-script/Makefile | 4 +--- .../data-formatter/data-formatter-skip-summary/Makefile | 4 +--- .../data-formatter/data-formatter-smart-array/Makefile | 4 +--- .../data-formatter-stl/libcxx/atomic/Makefile | 3 +-- .../data-formatter-stl/libcxx/bitset/Makefile | 4 +--- .../data-formatter-stl/libcxx/forward_list/Makefile | 4 +--- .../data-formatter-stl/libcxx/function/Makefile | 3 +-- .../data-formatter-stl/libcxx/initializerlist/Makefile | 3 +-- .../data-formatter-stl/libcxx/iterator/Makefile | 4 +--- .../data-formatter/data-formatter-stl/libcxx/list/Makefile | 4 +--- .../data-formatter-stl/libcxx/list/loop/Makefile | 4 +--- .../data-formatter/data-formatter-stl/libcxx/map/Makefile | 4 +--- .../data-formatter-stl/libcxx/multimap/Makefile | 4 +--- .../data-formatter-stl/libcxx/multiset/Makefile | 4 +--- .../data-formatter-stl/libcxx/optional/Makefile | 4 +--- .../data-formatter-stl/libcxx/queue/Makefile | 4 +--- .../data-formatter/data-formatter-stl/libcxx/set/Makefile | 4 +--- .../data-formatter-stl/libcxx/string/Makefile | 4 +--- .../data-formatter-stl/libcxx/tuple/Makefile | 4 +--- .../data-formatter-stl/libcxx/unordered/Makefile | 4 +--- .../data-formatter-stl/libcxx/variant/Makefile | 4 +--- .../data-formatter-stl/libcxx/vbool/Makefile | 4 +--- .../data-formatter-stl/libcxx/vector/Makefile | 4 +--- .../data-formatter-stl/libstdcpp/iterator/Makefile | 4 +--- .../data-formatter-stl/libstdcpp/list/Makefile | 4 +--- .../data-formatter-stl/libstdcpp/map/Makefile | 4 +--- .../data-formatter-stl/libstdcpp/smart_ptr/Makefile | 4 +--- .../data-formatter-stl/libstdcpp/string/Makefile | 4 +--- .../data-formatter-stl/libstdcpp/tuple/Makefile | 4 +--- .../data-formatter-stl/libstdcpp/unique_ptr/Makefile | 4 +--- .../data-formatter-stl/libstdcpp/vbool/Makefile | 4 +--- .../data-formatter-stl/libstdcpp/vector/Makefile | 4 +--- .../data-formatter/data-formatter-synth/Makefile | 4 +--- .../data-formatter/data-formatter-synthtype/Makefile | 4 +--- .../data-formatter/data-formatter-synthval/Makefile | 4 +--- .../functionalities/data-formatter/dump_dynamic/Makefile | 3 +-- .../data-formatter/format-propagation/Makefile | 4 +--- .../data-formatter/frameformat_smallstruct/Makefile | 4 +--- .../test/functionalities/data-formatter/hexcaps/Makefile | 4 +--- .../data-formatter/language_category_updates/Makefile | 4 +--- .../functionalities/data-formatter/nsarraysynth/Makefile | 4 +--- .../data-formatter/nsdictionarysynth/Makefile | 4 +--- .../functionalities/data-formatter/nssetsynth/Makefile | 4 +--- .../data-formatter/ostypeformatting/Makefile | 4 +--- .../test/functionalities/data-formatter/parray/Makefile | 4 +--- .../test/functionalities/data-formatter/poarray/Makefile | 4 +--- .../data-formatter/ptr_ref_typedef/Makefile | 4 +--- .../data-formatter/pyobjsynthprovider/Makefile | 4 +--- .../data-formatter/refpointer-recursion/Makefile | 4 +--- .../data-formatter/setvaluefromcstring/Makefile | 3 +-- .../functionalities/data-formatter/stringprinter/Makefile | 3 +-- .../data-formatter/summary-string-onfail/Makefile | 4 +--- .../functionalities/data-formatter/synthcapping/Makefile | 4 +--- .../functionalities/data-formatter/synthupdate/Makefile | 4 +--- .../data-formatter/type_summary_list_script/Makefile | 4 +--- .../functionalities/data-formatter/typedef_array/Makefile | 3 +-- .../data-formatter/user-format-vs-summary/Makefile | 4 +--- .../data-formatter/var-in-aggregate-misuse/Makefile | 4 +--- .../data-formatter/varscript_formatting/Makefile | 4 +--- .../functionalities/data-formatter/vector-types/Makefile | 4 +--- .../lldbsuite/test/functionalities/dead-strip/Makefile | 4 +--- .../test/functionalities/deleted-executable/Makefile | 4 +--- .../functionalities/dynamic_value_child_count/Makefile | 4 +--- .../Python/lldbsuite/test/functionalities/exec/Makefile | 4 +--- .../lldbsuite/test/functionalities/exec/secondprog.mk | 4 +--- .../lldbsuite/test/functionalities/fat_archives/Makefile | 1 - .../test/functionalities/inferior-assert/Makefile | 4 +--- .../test/functionalities/inferior-changed/Makefile | 4 +--- .../test/functionalities/inferior-crashing/Makefile | 4 +--- .../inferior-crashing/recursive-inferior/Makefile | 4 +--- .../test/functionalities/inline-stepping/Makefile | 4 +--- .../lldbsuite/test/functionalities/jitloader_gdb/Makefile | 4 +--- .../lldbsuite/test/functionalities/jitloader_gdb/simple.mk | 4 +--- .../lldbsuite/test/functionalities/load_unload/Makefile | 4 +--- .../Python/lldbsuite/test/functionalities/load_unload/a.mk | 4 +--- .../Python/lldbsuite/test/functionalities/load_unload/b.mk | 4 +--- .../Python/lldbsuite/test/functionalities/load_unload/c.mk | 4 +--- .../Python/lldbsuite/test/functionalities/load_unload/d.mk | 4 +--- .../test/functionalities/load_unload/hidden/Makefile | 4 +--- .../test/functionalities/load_using_paths/Makefile | 4 +--- .../test/functionalities/load_using_paths/hidden/Makefile | 4 +--- .../Python/lldbsuite/test/functionalities/longjmp/Makefile | 4 +--- .../lldbsuite/test/functionalities/memory-region/Makefile | 4 +--- .../lldbsuite/test/functionalities/memory/cache/Makefile | 4 +--- .../lldbsuite/test/functionalities/memory/find/Makefile | 4 +--- .../lldbsuite/test/functionalities/memory/read/Makefile | 4 +--- .../lldbsuite/test/functionalities/mtc/simple/Makefile | 4 +--- .../non-overlapping-index-variable-i/Makefile | 4 +--- .../test/functionalities/plugins/command_plugin/Makefile | 4 +--- .../test/functionalities/plugins/python_os_plugin/Makefile | 3 +-- .../test/functionalities/postmortem/elf-core/gcore/main.mk | 4 +--- .../postmortem/elf-core/thread_crash/main.mk | 4 +--- .../test/functionalities/postmortem/minidump/Makefile | 4 +--- .../lldbsuite/test/functionalities/pre_run_dylibs/Makefile | 4 +--- .../lldbsuite/test/functionalities/process_group/Makefile | 4 +--- .../test/functionalities/process_save_core/Makefile | 4 +--- .../lldbsuite/test/functionalities/ptr_refs/Makefile | 4 +--- .../lldbsuite/test/functionalities/recursion/Makefile | 4 +--- .../Python/lldbsuite/test/functionalities/rerun/Makefile | 4 +--- .../lldbsuite/test/functionalities/return-value/Makefile | 4 +--- .../lldbsuite/test/functionalities/set-data/Makefile | 4 +--- .../Python/lldbsuite/test/functionalities/signal/Makefile | 4 +--- .../test/functionalities/signal/handle-abrt/Makefile | 4 +--- .../test/functionalities/signal/handle-segv/Makefile | 4 +--- .../lldbsuite/test/functionalities/signal/raise/Makefile | 4 +--- .../lldbsuite/test/functionalities/stats_api/Makefile | 3 +-- .../test/functionalities/step-avoids-no-debug/Makefile | 4 +--- .../lldbsuite/test/functionalities/step_scripted/Makefile | 4 +--- .../tail_call_frames/ambiguous_tail_call_seq1/Makefile | 3 +-- .../tail_call_frames/ambiguous_tail_call_seq2/Makefile | 3 +-- .../tail_call_frames/disambiguate_call_site/Makefile | 3 +-- .../disambiguate_paths_to_common_sink/Makefile | 3 +-- .../tail_call_frames/disambiguate_tail_call_seq/Makefile | 3 +-- .../tail_call_frames/inlining_and_tail_calls/Makefile | 3 +-- .../tail_call_frames/sbapi_support/Makefile | 3 +-- .../tail_call_frames/thread_step_out_message/Makefile | 3 +-- .../tail_call_frames/thread_step_out_or_return/Makefile | 3 +-- .../tail_call_frames/unambiguous_sequence/Makefile | 3 +-- .../target-new-solib-notifications/Makefile | 4 +--- .../lldbsuite/test/functionalities/target_var/Makefile | 4 +--- .../test/functionalities/thread/backtrace_all/Makefile | 4 +--- .../test/functionalities/thread/backtrace_limit/Makefile | 4 +--- .../test/functionalities/thread/break_after_join/Makefile | 4 +--- .../test/functionalities/thread/concurrent_events/Makefile | 4 +--- .../test/functionalities/thread/crash_during_step/Makefile | 4 +--- .../functionalities/thread/create_after_attach/Makefile | 4 +--- .../functionalities/thread/create_during_step/Makefile | 4 +--- .../test/functionalities/thread/exit_during_break/Makefile | 4 +--- .../test/functionalities/thread/exit_during_step/Makefile | 4 +--- .../lldbsuite/test/functionalities/thread/jump/Makefile | 4 +--- .../test/functionalities/thread/multi_break/Makefile | 4 +--- .../test/functionalities/thread/num_threads/Makefile | 4 +--- .../lldbsuite/test/functionalities/thread/state/Makefile | 4 +--- .../test/functionalities/thread/step_out/Makefile | 4 +--- .../test/functionalities/thread/step_until/Makefile | 4 +--- .../test/functionalities/thread/thread_exit/Makefile | 4 +--- .../functionalities/thread/thread_specific_break/Makefile | 4 +--- .../thread/thread_specific_break_plus_condition/Makefile | 4 +--- .../lldbsuite/test/functionalities/tsan/basic/Makefile | 4 +--- .../test/functionalities/tsan/cpp_global_location/Makefile | 4 +--- .../test/functionalities/tsan/global_location/Makefile | 4 +--- .../lldbsuite/test/functionalities/tsan/multiple/Makefile | 4 +--- .../test/functionalities/tsan/thread_leak/Makefile | 4 +--- .../test/functionalities/tsan/thread_numbers/Makefile | 4 +--- .../Python/lldbsuite/test/functionalities/tty/Makefile | 4 +--- .../test/functionalities/type_completion/Makefile | 4 +--- .../lldbsuite/test/functionalities/type_lookup/Makefile | 4 +--- .../lldbsuite/test/functionalities/ubsan/basic/Makefile | 4 +--- .../test/functionalities/ubsan/user-expression/Makefile | 4 +--- .../lldbsuite/test/functionalities/unwind/ehframe/Makefile | 4 +--- .../test/functionalities/unwind/noreturn/Makefile | 4 +--- .../test/functionalities/unwind/sigtramp/Makefile | 4 +--- .../test/functionalities/unwind/standard/Makefile | 4 +--- .../test/functionalities/value_md5_crash/Makefile | 4 +--- .../lldbsuite/test/functionalities/var_path/Makefile | 4 +--- .../Python/lldbsuite/test/issue_verification/Makefile | 3 +-- .../Python/lldbsuite/test/lang/c/anonymous/Makefile | 4 +--- .../Python/lldbsuite/test/lang/c/array_types/Makefile | 4 +--- .../Python/lldbsuite/test/lang/c/bitfields/Makefile | 4 +--- lldb/packages/Python/lldbsuite/test/lang/c/blocks/Makefile | 4 +--- .../lldbsuite/test/lang/c/conflicting-symbol/Makefile | 4 +--- .../Python/lldbsuite/test/lang/c/conflicting-symbol/One.mk | 4 +--- .../Python/lldbsuite/test/lang/c/conflicting-symbol/Two.mk | 4 +--- .../Python/lldbsuite/test/lang/c/const_variables/Makefile | 4 +--- .../Python/lldbsuite/test/lang/c/enum_types/Makefile | 4 +--- .../Python/lldbsuite/test/lang/c/find_struct_type/Makefile | 3 +-- .../packages/Python/lldbsuite/test/lang/c/forward/Makefile | 4 +--- .../Python/lldbsuite/test/lang/c/function_types/Makefile | 4 +--- .../Python/lldbsuite/test/lang/c/global_variables/Makefile | 4 +--- .../Python/lldbsuite/test/lang/c/local_variables/Makefile | 4 +--- .../packages/Python/lldbsuite/test/lang/c/modules/Makefile | 4 +--- .../Python/lldbsuite/test/lang/c/offsetof/Makefile | 3 +-- .../packages/Python/lldbsuite/test/lang/c/recurse/Makefile | 4 +--- .../lldbsuite/test/lang/c/register_variables/Makefile | 4 +--- .../Python/lldbsuite/test/lang/c/set_values/Makefile | 4 +--- .../Python/lldbsuite/test/lang/c/shared_lib/Makefile | 4 +--- .../test/lang/c/shared_lib_stripped_symbols/Makefile | 4 +--- .../Python/lldbsuite/test/lang/c/step-target/Makefile | 4 +--- .../Python/lldbsuite/test/lang/c/stepping/Makefile | 4 +--- .../packages/Python/lldbsuite/test/lang/c/strings/Makefile | 4 +--- .../Python/lldbsuite/test/lang/c/struct_types/Makefile | 3 +-- .../Python/lldbsuite/test/lang/c/tls_globals/Makefile | 4 +--- .../packages/Python/lldbsuite/test/lang/c/typedef/Makefile | 4 +--- .../packages/Python/lldbsuite/test/lang/c/unicode/Makefile | 4 +--- lldb/packages/Python/lldbsuite/test/lang/c/unions/Makefile | 4 +--- lldb/packages/Python/lldbsuite/test/lang/c/vla/Makefile | 4 +--- lldb/packages/Python/lldbsuite/test/lang/cpp/auto/Makefile | 4 +--- lldb/packages/Python/lldbsuite/test/lang/cpp/bool/Makefile | 4 +--- .../lldbsuite/test/lang/cpp/breakpoint-commands/Makefile | 4 +--- .../Makefile | 4 +--- .../Python/lldbsuite/test/lang/cpp/call-function/Makefile | 4 +--- .../Python/lldbsuite/test/lang/cpp/chained-calls/Makefile | 4 +--- .../Python/lldbsuite/test/lang/cpp/char1632_t/Makefile | 4 +--- .../Python/lldbsuite/test/lang/cpp/char8_t/Makefile | 4 +--- .../test/lang/cpp/class-template-parameter-pack/Makefile | 3 +-- .../Python/lldbsuite/test/lang/cpp/class_static/Makefile | 4 +--- .../Python/lldbsuite/test/lang/cpp/class_types/Makefile | 4 +--- .../Python/lldbsuite/test/lang/cpp/const_this/Makefile | 3 +-- .../Python/lldbsuite/test/lang/cpp/diamond/Makefile | 4 +--- .../test/lang/cpp/dynamic-value-same-basename/Makefile | 4 +--- .../Python/lldbsuite/test/lang/cpp/dynamic-value/Makefile | 4 +--- .../Python/lldbsuite/test/lang/cpp/enum_types/Makefile | 4 +--- .../Python/lldbsuite/test/lang/cpp/exceptions/Makefile | 4 +--- .../Python/lldbsuite/test/lang/cpp/extern_c/Makefile | 3 +-- .../lldbsuite/test/lang/cpp/frame-var-anon-unions/Makefile | 4 +--- .../lang/cpp/function-template-parameter-pack/Makefile | 3 +-- .../Python/lldbsuite/test/lang/cpp/function_refs/Makefile | 3 +-- .../lldbsuite/test/lang/cpp/global_operators/Makefile | 4 +--- .../lldbsuite/test/lang/cpp/global_variables/Makefile | 4 +--- .../lldbsuite/test/lang/cpp/gmodules-templates/Makefile | 4 +--- .../Python/lldbsuite/test/lang/cpp/gmodules/Makefile | 4 +--- .../lldbsuite/test/lang/cpp/incomplete-types/Makefile | 4 +--- .../Python/lldbsuite/test/lang/cpp/inlines/Makefile | 4 +--- .../lldbsuite/test/lang/cpp/limit-debug-info/Makefile | 4 +--- .../Python/lldbsuite/test/lang/cpp/llvm-style/Makefile | 3 +-- .../lang/cpp/member-and-local-vars-with-same-name/Makefile | 4 +--- .../Python/lldbsuite/test/lang/cpp/modules-import/Makefile | 3 +-- .../Python/lldbsuite/test/lang/cpp/namespace/Makefile | 4 +--- .../lldbsuite/test/lang/cpp/namespace_conflicts/Makefile | 3 +-- .../lldbsuite/test/lang/cpp/namespace_definitions/Makefile | 4 +--- .../lldbsuite/test/lang/cpp/namespace_definitions/a.mk | 4 +--- .../lldbsuite/test/lang/cpp/namespace_definitions/b.mk | 4 +--- .../Python/lldbsuite/test/lang/cpp/nsimport/Makefile | 4 +--- .../Python/lldbsuite/test/lang/cpp/offsetof/Makefile | 3 +-- .../lldbsuite/test/lang/cpp/operator-overload/Makefile | 4 +--- .../Python/lldbsuite/test/lang/cpp/operators/Makefile | 3 +-- .../lldbsuite/test/lang/cpp/overloaded-functions/Makefile | 4 +--- .../lldbsuite/test/lang/cpp/rvalue-references/Makefile | 4 +--- .../packages/Python/lldbsuite/test/lang/cpp/scope/Makefile | 4 +--- .../Python/lldbsuite/test/lang/cpp/signed_types/Makefile | 4 +--- .../Python/lldbsuite/test/lang/cpp/static_members/Makefile | 4 +--- .../Python/lldbsuite/test/lang/cpp/static_methods/Makefile | 4 +--- .../test/lang/cpp/std-function-step-into-callable/Makefile | 4 +--- lldb/packages/Python/lldbsuite/test/lang/cpp/stl/Makefile | 4 +--- .../Python/lldbsuite/test/lang/cpp/symbols/Makefile | 3 +-- .../lldbsuite/test/lang/cpp/template-function/Makefile | 4 +--- .../Python/lldbsuite/test/lang/cpp/template/Makefile | 4 +--- lldb/packages/Python/lldbsuite/test/lang/cpp/this/Makefile | 4 +--- .../Python/lldbsuite/test/lang/cpp/trivial_abi/Makefile | 4 +--- .../Python/lldbsuite/test/lang/cpp/type_lookup/Makefile | 3 +-- .../lldbsuite/test/lang/cpp/unicode-literals/Makefile | 4 +--- .../Python/lldbsuite/test/lang/cpp/unique-types/Makefile | 4 +--- .../Python/lldbsuite/test/lang/cpp/unsigned_types/Makefile | 4 +--- .../lldbsuite/test/lang/cpp/virtual-overload/Makefile | 4 +--- .../Python/lldbsuite/test/lang/cpp/virtual/Makefile | 4 +--- .../Python/lldbsuite/test/lang/cpp/wchar_t/Makefile | 4 +--- lldb/packages/Python/lldbsuite/test/lang/mixed/Makefile | 4 +--- .../Python/lldbsuite/test/lang/objc/blocks/Makefile | 4 +--- .../test/lang/objc/conflicting-definition/Makefile | 4 +--- .../test/lang/objc/conflicting-definition/Test/Test.mk | 4 +--- .../lang/objc/conflicting-definition/TestExt/TestExt.mk | 4 +--- .../Python/lldbsuite/test/lang/objc/exceptions/Makefile | 4 +--- .../Python/lldbsuite/test/lang/objc/forward-decl/Makefile | 4 +--- .../Python/lldbsuite/test/lang/objc/foundation/Makefile | 4 +--- .../Python/lldbsuite/test/lang/objc/global_ptrs/Makefile | 4 +--- .../Python/lldbsuite/test/lang/objc/hidden-ivars/Makefile | 4 +--- .../Python/lldbsuite/test/lang/objc/ivar-IMP/Makefile | 4 +--- .../lldbsuite/test/lang/objc/modules-auto-import/Makefile | 3 +-- .../Python/lldbsuite/test/lang/objc/modules-cache/Makefile | 3 +-- .../lldbsuite/test/lang/objc/modules-incomplete/Makefile | 4 +--- .../test/lang/objc/modules-inline-functions/Makefile | 4 +--- .../Python/lldbsuite/test/lang/objc/modules/Makefile | 4 +--- .../Python/lldbsuite/test/lang/objc/objc++/Makefile | 4 +--- .../test/lang/objc/objc-baseclass-sbtype/Makefile | 4 +--- .../lldbsuite/test/lang/objc/objc-builtin-types/Makefile | 4 +--- .../Python/lldbsuite/test/lang/objc/objc-checker/Makefile | 4 +--- .../lldbsuite/test/lang/objc/objc-class-method/Makefile | 4 +--- .../lldbsuite/test/lang/objc/objc-dyn-sbtype/Makefile | 4 +--- .../lldbsuite/test/lang/objc/objc-dynamic-value/Makefile | 4 +--- .../lldbsuite/test/lang/objc/objc-ivar-offsets/Makefile | 4 +--- .../lldbsuite/test/lang/objc/objc-ivar-stripped/Makefile | 4 +--- .../lldbsuite/test/lang/objc/objc-new-syntax/Makefile | 4 +--- .../lldbsuite/test/lang/objc/objc-optimized/Makefile | 4 +--- .../Python/lldbsuite/test/lang/objc/objc-property/Makefile | 4 +--- .../lldbsuite/test/lang/objc/objc-runtime-ivars/Makefile | 4 +--- .../test/lang/objc/objc-static-method-stripped/Makefile | 4 +--- .../lldbsuite/test/lang/objc/objc-static-method/Makefile | 4 +--- .../Python/lldbsuite/test/lang/objc/objc-stepping/Makefile | 4 +--- .../lldbsuite/test/lang/objc/objc-struct-argument/Makefile | 4 +--- .../lldbsuite/test/lang/objc/objc-struct-return/Makefile | 4 +--- .../Python/lldbsuite/test/lang/objc/objc-super/Makefile | 4 +--- .../Python/lldbsuite/test/lang/objc/orderedset/Makefile | 4 +--- .../Python/lldbsuite/test/lang/objc/print-obj/Makefile | 4 +--- .../Python/lldbsuite/test/lang/objc/ptr_refs/Makefile | 4 +--- .../Python/lldbsuite/test/lang/objc/radar-9691614/Makefile | 4 +--- .../Python/lldbsuite/test/lang/objc/rdar-10967107/Makefile | 4 +--- .../Python/lldbsuite/test/lang/objc/rdar-11355592/Makefile | 4 +--- .../Python/lldbsuite/test/lang/objc/rdar-12408181/Makefile | 4 +--- .../lldbsuite/test/lang/objc/real-definition/Makefile | 4 +--- .../Python/lldbsuite/test/lang/objc/sample/Makefile | 4 +--- .../packages/Python/lldbsuite/test/lang/objc/self/Makefile | 4 +--- .../test/lang/objc/single-entry-dictionary/Makefile | 4 +--- .../lldbsuite/test/lang/objcxx/class-name-clash/Makefile | 3 +-- .../lldbsuite/test/lang/objcxx/cxx-bridged-po/Makefile | 4 +--- .../test/lang/objcxx/hide-runtime-values/Makefile | 4 +--- .../Python/lldbsuite/test/lang/objcxx/sample/Makefile | 4 +--- .../Python/lldbsuite/test/linux/add-symbols/Makefile | 3 +-- .../Python/lldbsuite/test/linux/builtin_trap/Makefile | 4 +--- .../test/linux/mix-dwo-and-regular-objects/Makefile | 4 +--- .../Python/lldbsuite/test/linux/sepdebugsymlink/Makefile | 3 +-- .../linux/thread/create_during_instruction_step/Makefile | 4 +--- lldb/packages/Python/lldbsuite/test/lldbinline.py | 7 +------ .../test/macosx/duplicate-archive-members/Makefile | 4 +--- .../lldbsuite/test/macosx/find-app-in-bundle/Makefile | 1 - .../macosx/find-dsym/bundle-with-dot-in-filename/Makefile | 1 - .../lldbsuite/test/macosx/find-dsym/deep-bundle/Makefile | 1 - .../Python/lldbsuite/test/macosx/function-starts/Makefile | 4 +--- .../Python/lldbsuite/test/macosx/indirect_symbol/Makefile | 4 +--- .../lldbsuite/test/macosx/lc-note/kern-ver-str/Makefile | 4 +--- .../macosx/lc-note/kern-ver-str/create-empty-corefile.mk | 4 +--- lldb/packages/Python/lldbsuite/test/macosx/nslog/Makefile | 4 +--- lldb/packages/Python/lldbsuite/test/macosx/order/Makefile | 4 +--- lldb/packages/Python/lldbsuite/test/macosx/queues/Makefile | 4 +--- .../lldbsuite/test/macosx/safe-to-func-call/Makefile | 4 +--- .../Python/lldbsuite/test/macosx/thread-names/Makefile | 4 +--- .../Python/lldbsuite/test/macosx/universal/Makefile | 4 +--- .../packages/Python/lldbsuite/test/plugins/builder_base.py | 1 + .../Python/lldbsuite/test/python_api/breakpoint/Makefile | 4 +--- .../lldbsuite/test/python_api/class_members/Makefile | 4 +--- .../Python/lldbsuite/test/python_api/event/Makefile | 4 +--- .../lldbsuite/test/python_api/findvalue_duplist/Makefile | 4 +--- .../Python/lldbsuite/test/python_api/formatters/Makefile | 4 +--- .../Python/lldbsuite/test/python_api/frame/Makefile | 4 +--- .../lldbsuite/test/python_api/frame/get-variables/Makefile | 4 +--- .../lldbsuite/test/python_api/frame/inlines/Makefile | 4 +--- .../lldbsuite/test/python_api/function_symbol/Makefile | 4 +--- .../Python/lldbsuite/test/python_api/hello_world/Makefile | 4 +--- .../Python/lldbsuite/test/python_api/interpreter/Makefile | 4 +--- .../lldbsuite/test/python_api/lldbutil/frame/Makefile | 4 +--- .../lldbsuite/test/python_api/lldbutil/iter/Makefile | 4 +--- .../lldbsuite/test/python_api/lldbutil/process/Makefile | 4 +--- .../lldbsuite/test/python_api/module_section/Makefile | 4 +--- .../Python/lldbsuite/test/python_api/name_lookup/Makefile | 4 +--- .../Python/lldbsuite/test/python_api/objc_type/Makefile | 4 +--- .../Python/lldbsuite/test/python_api/process/Makefile | 4 +--- .../Python/lldbsuite/test/python_api/process/io/Makefile | 4 +--- .../test/python_api/process/read-mem-cstring/Makefile | 4 +--- .../lldbsuite/test/python_api/rdar-12481949/Makefile | 4 +--- .../Python/lldbsuite/test/python_api/sbdata/Makefile | 4 +--- .../test/python_api/sbvalue_const_addrof/Makefile | 3 +-- .../lldbsuite/test/python_api/sbvalue_persist/Makefile | 4 +--- .../Python/lldbsuite/test/python_api/section/Makefile | 4 +--- .../Python/lldbsuite/test/python_api/signals/Makefile | 4 +--- .../lldbsuite/test/python_api/symbol-context/Makefile | 4 +--- .../test/python_api/symbol-context/two-files/Makefile | 4 +--- .../Python/lldbsuite/test/python_api/target/Makefile | 4 +--- .../Python/lldbsuite/test/python_api/thread/Makefile | 4 +--- .../Python/lldbsuite/test/python_api/type/Makefile | 4 +--- .../Python/lldbsuite/test/python_api/value/Makefile | 4 +--- .../lldbsuite/test/python_api/value/change_values/Makefile | 4 +--- .../lldbsuite/test/python_api/value/empty_class/Makefile | 4 +--- .../lldbsuite/test/python_api/value/linked_list/Makefile | 4 +--- .../lldbsuite/test/python_api/value_var_update/Makefile | 4 +--- .../Python/lldbsuite/test/python_api/watchpoint/Makefile | 4 +--- .../test/python_api/watchpoint/condition/Makefile | 4 +--- .../test/python_api/watchpoint/watchlocation/Makefile | 4 +--- lldb/packages/Python/lldbsuite/test/sample_test/Makefile | 4 +--- .../packages/Python/lldbsuite/test/source-manager/Makefile | 4 +--- .../Python/lldbsuite/test/tools/lldb-server/Makefile | 4 +--- .../test/tools/lldb-server/inferior-crash/Makefile | 4 +--- .../test/tools/lldb-server/libraries-svr4/Makefile | 4 +--- .../test/tools/lldb-server/libraries-svr4/svr4lib_a.mk | 4 +--- .../tools/lldb-server/libraries-svr4/svr4lib_b_quote.mk | 4 +--- .../tools/lldb-server/platform-process-connect/Makefile | 4 +--- .../test/tools/lldb-server/register-reading/Makefile | 4 +--- .../test/tools/lldb-server/signal-filtering/Makefile | 4 +--- .../lldbsuite/test/tools/lldb-server/thread-name/Makefile | 4 +--- .../lldbsuite/test/tools/lldb-vscode/attach/Makefile | 4 +--- .../lldbsuite/test/tools/lldb-vscode/breakpoint/Makefile | 4 +--- .../lldbsuite/test/tools/lldb-vscode/launch/Makefile | 4 +--- .../lldbsuite/test/tools/lldb-vscode/stackTrace/Makefile | 4 +--- .../Python/lldbsuite/test/tools/lldb-vscode/step/Makefile | 4 +--- .../lldbsuite/test/tools/lldb-vscode/variables/Makefile | 4 +--- lldb/packages/Python/lldbsuite/test/types/Makefile | 4 +--- 557 files changed, 552 insertions(+), 1581 deletions(-) diff --git a/lldb/packages/Python/lldbsuite/test/Makefile b/lldb/packages/Python/lldbsuite/test/Makefile index 4d08ef39d4db..c662fd1af007 100644 --- a/lldb/packages/Python/lldbsuite/test/Makefile +++ b/lldb/packages/Python/lldbsuite/test/Makefile @@ -1,4 +1,3 @@ -LLDB_LEVEL := .. include $(LLDB_LEVEL)/Makefile .PHONY: programs diff --git a/lldb/packages/Python/lldbsuite/test/android/platform/Makefile b/lldb/packages/Python/lldbsuite/test/android/platform/Makefile index 22e42c5a776e..3d0b98f13f3d 100644 --- a/lldb/packages/Python/lldbsuite/test/android/platform/Makefile +++ b/lldb/packages/Python/lldbsuite/test/android/platform/Makefile @@ -1,4 +1,2 @@ -LEVEL = ../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/api/check_public_api_headers/Makefile b/lldb/packages/Python/lldbsuite/test/api/check_public_api_headers/Makefile index 8a7102e347af..99998b20bcb0 100644 --- a/lldb/packages/Python/lldbsuite/test/api/check_public_api_headers/Makefile +++ b/lldb/packages/Python/lldbsuite/test/api/check_public_api_headers/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/api/listeners/Makefile b/lldb/packages/Python/lldbsuite/test/api/listeners/Makefile index fbedeab4cb9b..692ba1732285 100644 --- a/lldb/packages/Python/lldbsuite/test/api/listeners/Makefile +++ b/lldb/packages/Python/lldbsuite/test/api/listeners/Makefile @@ -1,6 +1,4 @@ -LEVEL = ../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/api/multiple-debuggers/Makefile b/lldb/packages/Python/lldbsuite/test/api/multiple-debuggers/Makefile index 08f8850e3e8f..f40386a5227e 100644 --- a/lldb/packages/Python/lldbsuite/test/api/multiple-debuggers/Makefile +++ b/lldb/packages/Python/lldbsuite/test/api/multiple-debuggers/Makefile @@ -1,8 +1,6 @@ -LEVEL = ../../make - MAKE_DSYM := NO ENABLE_THREADS := YES CXX_SOURCES := multi-process-driver.cpp testprog.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/api/multiple-targets/Makefile b/lldb/packages/Python/lldbsuite/test/api/multiple-targets/Makefile index bee559c8ecdd..3316b59b623e 100644 --- a/lldb/packages/Python/lldbsuite/test/api/multiple-targets/Makefile +++ b/lldb/packages/Python/lldbsuite/test/api/multiple-targets/Makefile @@ -1,8 +1,6 @@ -LEVEL = ../../make - MAKE_DSYM := NO ENABLE_THREADS := YES CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/api/multithreaded/Makefile b/lldb/packages/Python/lldbsuite/test/api/multithreaded/Makefile index 37323ea78190..817672190672 100644 --- a/lldb/packages/Python/lldbsuite/test/api/multithreaded/Makefile +++ b/lldb/packages/Python/lldbsuite/test/api/multithreaded/Makefile @@ -1,9 +1,7 @@ -LEVEL = ../../make - ENABLE_THREADS := YES CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules clean:: rm -rf $(wildcard *.o *.d *.dSYM) diff --git a/lldb/packages/Python/lldbsuite/test/arm/breakpoint-it/Makefile b/lldb/packages/Python/lldbsuite/test/arm/breakpoint-it/Makefile index 5d2224cb6560..dac447e5c70b 100644 --- a/lldb/packages/Python/lldbsuite/test/arm/breakpoint-it/Makefile +++ b/lldb/packages/Python/lldbsuite/test/arm/breakpoint-it/Makefile @@ -1,6 +1,4 @@ -LEVEL = ../../make - C_SOURCES := main.c CFLAGS_EXTRAS = -mthumb -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/arm/breakpoint-thumb-codesection/Makefile b/lldb/packages/Python/lldbsuite/test/arm/breakpoint-thumb-codesection/Makefile index ea79c55cd4a9..0d6bbe2df010 100644 --- a/lldb/packages/Python/lldbsuite/test/arm/breakpoint-thumb-codesection/Makefile +++ b/lldb/packages/Python/lldbsuite/test/arm/breakpoint-thumb-codesection/Makefile @@ -1,6 +1,4 @@ -LEVEL = ../../make - C_SOURCES := main.c CFLAGS_EXTRAS = -mthumb -include $(LEVEL)/Makefile.rules \ No newline at end of file +include Makefile.rules \ No newline at end of file diff --git a/lldb/packages/Python/lldbsuite/test/benchmarks/continue/Makefile b/lldb/packages/Python/lldbsuite/test/benchmarks/continue/Makefile index 8a7102e347af..99998b20bcb0 100644 --- a/lldb/packages/Python/lldbsuite/test/benchmarks/continue/Makefile +++ b/lldb/packages/Python/lldbsuite/test/benchmarks/continue/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/benchmarks/expression/Makefile b/lldb/packages/Python/lldbsuite/test/benchmarks/expression/Makefile index 8a7102e347af..99998b20bcb0 100644 --- a/lldb/packages/Python/lldbsuite/test/benchmarks/expression/Makefile +++ b/lldb/packages/Python/lldbsuite/test/benchmarks/expression/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/benchmarks/libcxxlist/Makefile b/lldb/packages/Python/lldbsuite/test/benchmarks/libcxxlist/Makefile index 8a7102e347af..99998b20bcb0 100644 --- a/lldb/packages/Python/lldbsuite/test/benchmarks/libcxxlist/Makefile +++ b/lldb/packages/Python/lldbsuite/test/benchmarks/libcxxlist/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/benchmarks/libcxxmap/Makefile b/lldb/packages/Python/lldbsuite/test/benchmarks/libcxxmap/Makefile index 8a7102e347af..99998b20bcb0 100644 --- a/lldb/packages/Python/lldbsuite/test/benchmarks/libcxxmap/Makefile +++ b/lldb/packages/Python/lldbsuite/test/benchmarks/libcxxmap/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/add-dsym/uuid/Makefile b/lldb/packages/Python/lldbsuite/test/commands/add-dsym/uuid/Makefile index 314f1cb2f077..99998b20bcb0 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/add-dsym/uuid/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/add-dsym/uuid/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/apropos/with-process/Makefile b/lldb/packages/Python/lldbsuite/test/commands/apropos/with-process/Makefile index 314f1cb2f077..99998b20bcb0 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/apropos/with-process/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/apropos/with-process/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/breakpoint/basic/Makefile b/lldb/packages/Python/lldbsuite/test/commands/breakpoint/basic/Makefile index a6376f9b165d..8d669cbfd2b7 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/breakpoint/basic/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/breakpoint/basic/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - C_SOURCES := main.c a.c b.c -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/command/nested_alias/Makefile b/lldb/packages/Python/lldbsuite/test/commands/command/nested_alias/Makefile index 314f1cb2f077..99998b20bcb0 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/command/nested_alias/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/command/nested_alias/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/command/script/Makefile b/lldb/packages/Python/lldbsuite/test/commands/command/script/Makefile index 314f1cb2f077..99998b20bcb0 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/command/script/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/command/script/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/command/script/import/Makefile b/lldb/packages/Python/lldbsuite/test/commands/command/script/import/Makefile index 9374aef487fe..d9ee1cc4116b 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/command/script/import/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/command/script/import/Makefile @@ -1,6 +1,4 @@ -LEVEL = ../../../make - C_SOURCES := main.c EXE := hello_world -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/command/script/import/rdar-12586188/Makefile b/lldb/packages/Python/lldbsuite/test/commands/command/script/import/rdar-12586188/Makefile index 7913aaa4b746..22f1051530f8 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/command/script/import/rdar-12586188/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/command/script/import/rdar-12586188/Makefile @@ -1,3 +1 @@ -LEVEL = ../../../../make - -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/disassemble/basic/Makefile b/lldb/packages/Python/lldbsuite/test/commands/disassemble/basic/Makefile index 314f1cb2f077..99998b20bcb0 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/disassemble/basic/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/disassemble/basic/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/anonymous-struct/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/anonymous-struct/Makefile index 314f1cb2f077..99998b20bcb0 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/expression/anonymous-struct/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/expression/anonymous-struct/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/argument_passing_restrictions/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/argument_passing_restrictions/Makefile index 314f1cb2f077..99998b20bcb0 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/expression/argument_passing_restrictions/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/expression/argument_passing_restrictions/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/call-function/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/call-function/Makefile index 6e8e801af010..31f2d5e8fc29 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/expression/call-function/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/expression/call-function/Makefile @@ -1,8 +1,6 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules clean:: rm -rf $(wildcard *.o *.d *.dSYM) diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/call-overridden-method/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/call-overridden-method/Makefile index 6e8e801af010..31f2d5e8fc29 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/expression/call-overridden-method/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/expression/call-overridden-method/Makefile @@ -1,8 +1,6 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules clean:: rm -rf $(wildcard *.o *.d *.dSYM) diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/call-restarts/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/call-restarts/Makefile index e56f0ab614d8..fa5901ebca1e 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/expression/call-restarts/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/expression/call-restarts/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - C_SOURCES := lotta-signals.c -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/call-throws/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/call-throws/Makefile index c47338f0f130..33746217ecba 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/expression/call-throws/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/expression/call-throws/Makefile @@ -1,6 +1,4 @@ -LEVEL = ../../../make - OBJC_SOURCES := call-throws.m -include $(LEVEL)/Makefile.rules +include Makefile.rules LDFLAGS += -framework Foundation diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/cast_int_to_anonymous_enum/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/cast_int_to_anonymous_enum/Makefile index 314f1cb2f077..99998b20bcb0 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/expression/cast_int_to_anonymous_enum/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/expression/cast_int_to_anonymous_enum/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/char/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/char/Makefile index 314f1cb2f077..99998b20bcb0 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/expression/char/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/expression/char/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/class_template_specialization_empty_pack/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/class_template_specialization_empty_pack/Makefile index 314f1cb2f077..99998b20bcb0 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/expression/class_template_specialization_empty_pack/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/expression/class_template_specialization_empty_pack/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/completion-crash-incomplete-record/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/completion-crash-incomplete-record/Makefile index 99bfa7e03b47..3d0b98f13f3d 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/expression/completion-crash-incomplete-record/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/expression/completion-crash-incomplete-record/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/commands/expression/completion-crash-lambda/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/completion-crash-lambda/Makefile index 99bfa7e03b47..3d0b98f13f3d 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/expression/completion-crash-lambda/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/expression/completion-crash-lambda/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/commands/expression/completion-crash1/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/completion-crash1/Makefile index 99bfa7e03b47..3d0b98f13f3d 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/expression/completion-crash1/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/expression/completion-crash1/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/commands/expression/completion-crash2/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/completion-crash2/Makefile index 99bfa7e03b47..3d0b98f13f3d 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/expression/completion-crash2/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/expression/completion-crash2/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/commands/expression/completion/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/completion/Makefile index feebe26aad13..020dce7c31d1 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/expression/completion/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/expression/completion/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp other.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/context-object-objc/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/context-object-objc/Makefile index 242d36fe860f..2f36b673031d 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/expression/context-object-objc/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/expression/context-object-objc/Makefile @@ -1,6 +1,4 @@ -LEVEL = ../../../make - OBJC_SOURCES := main.m -include $(LEVEL)/Makefile.rules +include Makefile.rules LDFLAGS += -framework Foundation diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/context-object/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/context-object/Makefile index 314f1cb2f077..99998b20bcb0 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/expression/context-object/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/expression/context-object/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/dollar-in-variable/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/dollar-in-variable/Makefile index cd9ca5c86d84..c9319d6e6888 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/expression/dollar-in-variable/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/expression/dollar-in-variable/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/commands/expression/dont_allow_jit/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/dont_allow_jit/Makefile index 6067ee45e984..aa5f222c08e3 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/expression/dont_allow_jit/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/expression/dont_allow_jit/Makefile @@ -1,6 +1,4 @@ -LEVEL = ../../../make - C_SOURCES := main.c CFLAGS_EXTRAS += -std=c99 -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/entry-bp/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/entry-bp/Makefile index b09a579159d4..10495940055b 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/expression/entry-bp/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/expression/entry-bp/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/expr-in-syscall/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/expr-in-syscall/Makefile index 314f1cb2f077..99998b20bcb0 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/expression/expr-in-syscall/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/expression/expr-in-syscall/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/fixits/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/fixits/Makefile index 314f1cb2f077..99998b20bcb0 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/expression/fixits/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/expression/fixits/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/formatters/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/formatters/Makefile index 314f1cb2f077..99998b20bcb0 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/expression/formatters/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/expression/formatters/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/function_template_specialization_temp_args/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/function_template_specialization_temp_args/Makefile index 314f1cb2f077..99998b20bcb0 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/expression/function_template_specialization_temp_args/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/expression/function_template_specialization_temp_args/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/basic/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/basic/Makefile index 6ed2bcfcffc8..12e489d83b2b 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/basic/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/basic/Makefile @@ -1,5 +1,4 @@ -LEVEL = ../../../../make USE_LIBCPP := 1 CXXFLAGS += $(MANDATORY_CXXMODULE_BUILD_CFLAGS) CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/conflicts/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/conflicts/Makefile index 6ed2bcfcffc8..12e489d83b2b 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/conflicts/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/conflicts/Makefile @@ -1,5 +1,4 @@ -LEVEL = ../../../../make USE_LIBCPP := 1 CXXFLAGS += $(MANDATORY_CXXMODULE_BUILD_CFLAGS) CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/deque-basic/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/deque-basic/Makefile index 6ed2bcfcffc8..12e489d83b2b 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/deque-basic/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/deque-basic/Makefile @@ -1,5 +1,4 @@ -LEVEL = ../../../../make USE_LIBCPP := 1 CXXFLAGS += $(MANDATORY_CXXMODULE_BUILD_CFLAGS) CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/deque-dbg-info-content/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/deque-dbg-info-content/Makefile index 6ed2bcfcffc8..12e489d83b2b 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/deque-dbg-info-content/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/deque-dbg-info-content/Makefile @@ -1,5 +1,4 @@ -LEVEL = ../../../../make USE_LIBCPP := 1 CXXFLAGS += $(MANDATORY_CXXMODULE_BUILD_CFLAGS) CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/forward_list-basic/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/forward_list-basic/Makefile index 6ed2bcfcffc8..12e489d83b2b 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/forward_list-basic/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/forward_list-basic/Makefile @@ -1,5 +1,4 @@ -LEVEL = ../../../../make USE_LIBCPP := 1 CXXFLAGS += $(MANDATORY_CXXMODULE_BUILD_CFLAGS) CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/forward_list-dbg-info-content/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/forward_list-dbg-info-content/Makefile index 6ed2bcfcffc8..12e489d83b2b 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/forward_list-dbg-info-content/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/forward_list-dbg-info-content/Makefile @@ -1,5 +1,4 @@ -LEVEL = ../../../../make USE_LIBCPP := 1 CXXFLAGS += $(MANDATORY_CXXMODULE_BUILD_CFLAGS) CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/list-basic/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/list-basic/Makefile index 6ed2bcfcffc8..12e489d83b2b 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/list-basic/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/list-basic/Makefile @@ -1,5 +1,4 @@ -LEVEL = ../../../../make USE_LIBCPP := 1 CXXFLAGS += $(MANDATORY_CXXMODULE_BUILD_CFLAGS) CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/list-dbg-info-content/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/list-dbg-info-content/Makefile index 6ed2bcfcffc8..12e489d83b2b 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/list-dbg-info-content/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/list-dbg-info-content/Makefile @@ -1,5 +1,4 @@ -LEVEL = ../../../../make USE_LIBCPP := 1 CXXFLAGS += $(MANDATORY_CXXMODULE_BUILD_CFLAGS) CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/no-std-module/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/no-std-module/Makefile index 6ed2bcfcffc8..12e489d83b2b 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/no-std-module/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/no-std-module/Makefile @@ -1,5 +1,4 @@ -LEVEL = ../../../../make USE_LIBCPP := 1 CXXFLAGS += $(MANDATORY_CXXMODULE_BUILD_CFLAGS) CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/queue/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/queue/Makefile index 6ed2bcfcffc8..12e489d83b2b 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/queue/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/queue/Makefile @@ -1,5 +1,4 @@ -LEVEL = ../../../../make USE_LIBCPP := 1 CXXFLAGS += $(MANDATORY_CXXMODULE_BUILD_CFLAGS) CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/shared_ptr-dbg-info-content/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/shared_ptr-dbg-info-content/Makefile index 6ed2bcfcffc8..12e489d83b2b 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/shared_ptr-dbg-info-content/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/shared_ptr-dbg-info-content/Makefile @@ -1,5 +1,4 @@ -LEVEL = ../../../../make USE_LIBCPP := 1 CXXFLAGS += $(MANDATORY_CXXMODULE_BUILD_CFLAGS) CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/shared_ptr/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/shared_ptr/Makefile index 6ed2bcfcffc8..12e489d83b2b 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/shared_ptr/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/shared_ptr/Makefile @@ -1,5 +1,4 @@ -LEVEL = ../../../../make USE_LIBCPP := 1 CXXFLAGS += $(MANDATORY_CXXMODULE_BUILD_CFLAGS) CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/stack/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/stack/Makefile index 6ed2bcfcffc8..12e489d83b2b 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/stack/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/stack/Makefile @@ -1,5 +1,4 @@ -LEVEL = ../../../../make USE_LIBCPP := 1 CXXFLAGS += $(MANDATORY_CXXMODULE_BUILD_CFLAGS) CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules 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 855bda529869..459a66c5c8b3 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 @@ -1,4 +1,3 @@ -LEVEL = ../../../../make # We don't have any standard include directories, so we can't # parse the test_common.h header we usually inject as it includes # system headers. @@ -7,4 +6,4 @@ NO_TEST_COMMON_H := 1 CXXFLAGS += $(MANDATORY_CXXMODULE_BUILD_CFLAGS) CXXFLAGS += -I $(SRCDIR)/root/usr/include/c++/include/ -I $(SRCDIR)/root/usr/include/ -nostdinc -nostdinc++ -nostdlib++ CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/unique_ptr-dbg-info-content/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/unique_ptr-dbg-info-content/Makefile index 6ed2bcfcffc8..12e489d83b2b 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/unique_ptr-dbg-info-content/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/unique_ptr-dbg-info-content/Makefile @@ -1,5 +1,4 @@ -LEVEL = ../../../../make USE_LIBCPP := 1 CXXFLAGS += $(MANDATORY_CXXMODULE_BUILD_CFLAGS) CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/unique_ptr/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/unique_ptr/Makefile index 6ed2bcfcffc8..12e489d83b2b 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/unique_ptr/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/unique_ptr/Makefile @@ -1,5 +1,4 @@ -LEVEL = ../../../../make USE_LIBCPP := 1 CXXFLAGS += $(MANDATORY_CXXMODULE_BUILD_CFLAGS) CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/vector-basic/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/vector-basic/Makefile index 6ed2bcfcffc8..12e489d83b2b 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/vector-basic/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/vector-basic/Makefile @@ -1,5 +1,4 @@ -LEVEL = ../../../../make USE_LIBCPP := 1 CXXFLAGS += $(MANDATORY_CXXMODULE_BUILD_CFLAGS) CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/vector-bool/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/vector-bool/Makefile index 6ed2bcfcffc8..12e489d83b2b 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/vector-bool/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/vector-bool/Makefile @@ -1,5 +1,4 @@ -LEVEL = ../../../../make USE_LIBCPP := 1 CXXFLAGS += $(MANDATORY_CXXMODULE_BUILD_CFLAGS) CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/vector-dbg-info-content/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/vector-dbg-info-content/Makefile index 6ed2bcfcffc8..12e489d83b2b 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/vector-dbg-info-content/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/vector-dbg-info-content/Makefile @@ -1,5 +1,4 @@ -LEVEL = ../../../../make USE_LIBCPP := 1 CXXFLAGS += $(MANDATORY_CXXMODULE_BUILD_CFLAGS) CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/vector-of-vectors/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/vector-of-vectors/Makefile index 6ed2bcfcffc8..12e489d83b2b 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/vector-of-vectors/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/vector-of-vectors/Makefile @@ -1,5 +1,4 @@ -LEVEL = ../../../../make USE_LIBCPP := 1 CXXFLAGS += $(MANDATORY_CXXMODULE_BUILD_CFLAGS) CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/weak_ptr-dbg-info-content/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/weak_ptr-dbg-info-content/Makefile index 6ed2bcfcffc8..12e489d83b2b 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/weak_ptr-dbg-info-content/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/weak_ptr-dbg-info-content/Makefile @@ -1,5 +1,4 @@ -LEVEL = ../../../../make USE_LIBCPP := 1 CXXFLAGS += $(MANDATORY_CXXMODULE_BUILD_CFLAGS) CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/weak_ptr/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/weak_ptr/Makefile index 6ed2bcfcffc8..12e489d83b2b 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/weak_ptr/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/weak_ptr/Makefile @@ -1,5 +1,4 @@ -LEVEL = ../../../../make USE_LIBCPP := 1 CXXFLAGS += $(MANDATORY_CXXMODULE_BUILD_CFLAGS) CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/import_builtin_fileid/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/import_builtin_fileid/Makefile index 82e0d19a0356..780b2660cd07 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/expression/import_builtin_fileid/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/expression/import_builtin_fileid/Makefile @@ -1,6 +1,4 @@ -LEVEL = ../../../make - OBJC_SOURCES := main.m -include $(LEVEL)/Makefile.rules +include Makefile.rules LDFLAGS += -framework Cocoa diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/inline-namespace/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/inline-namespace/Makefile index 314f1cb2f077..99998b20bcb0 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/expression/inline-namespace/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/expression/inline-namespace/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/ir-interpreter-phi-nodes/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/ir-interpreter-phi-nodes/Makefile index 9884d7d20b14..a1f689e07c77 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/expression/ir-interpreter-phi-nodes/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/expression/ir-interpreter-phi-nodes/Makefile @@ -1,5 +1,4 @@ -LEVEL = ../../../make CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/ir-interpreter/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/ir-interpreter/Makefile index 53303eaf4f89..00a9da08656b 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/expression/ir-interpreter/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/expression/ir-interpreter/Makefile @@ -1,7 +1,5 @@ -LEVEL = ../../../make - default: a.out C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/issue_11588/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/issue_11588/Makefile index 314f1cb2f077..99998b20bcb0 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/expression/issue_11588/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/expression/issue_11588/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/macros/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/macros/Makefile index 518045730b45..59070728a5fa 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/expression/macros/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/expression/macros/Makefile @@ -1,8 +1,6 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp DEBUG_INFO_FLAG = -g3 -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/multiline-completion/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/multiline-completion/Makefile index cd9ca5c86d84..c9319d6e6888 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/expression/multiline-completion/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/expression/multiline-completion/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/commands/expression/namespace_local_var_same_name_cpp_and_c/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/namespace_local_var_same_name_cpp_and_c/Makefile index 314f1cb2f077..99998b20bcb0 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/expression/namespace_local_var_same_name_cpp_and_c/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/expression/namespace_local_var_same_name_cpp_and_c/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/namespace_local_var_same_name_obj_c/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/namespace_local_var_same_name_obj_c/Makefile index e486bedb9b0b..9267f734396c 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/expression/namespace_local_var_same_name_obj_c/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/expression/namespace_local_var_same_name_obj_c/Makefile @@ -1,5 +1,4 @@ -LEVEL = ../../../make OBJCXX_SOURCES := main.mm util.mm -include $(LEVEL)/Makefile.rules +include Makefile.rules LDFLAGS += -framework Foundation diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/no-deadlock/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/no-deadlock/Makefile index f48ae861ae2c..f63adb4f5d2a 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/expression/no-deadlock/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/expression/no-deadlock/Makefile @@ -1,6 +1,4 @@ -LEVEL = ../../../make - C_SOURCES := locking.c ENABLE_THREADS := YES -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/options/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/options/Makefile index 457c4972f2d5..7df22699c57d 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/expression/options/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/expression/options/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp foo.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/persist_objc_pointeetype/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/persist_objc_pointeetype/Makefile index 864f1c8223c3..add737b47522 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/expression/persist_objc_pointeetype/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/expression/persist_objc_pointeetype/Makefile @@ -1,7 +1,5 @@ -LEVEL = ../../../make - OBJC_SOURCES := main.m -include $(LEVEL)/Makefile.rules +include Makefile.rules LDFLAGS += -framework Foundation -framework CloudKit diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/persistent_ptr_update/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/persistent_ptr_update/Makefile index f3d1687cd9f6..549336d02235 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/expression/persistent_ptr_update/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/expression/persistent_ptr_update/Makefile @@ -1,7 +1,5 @@ -LEVEL = ../../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/persistent_types/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/persistent_types/Makefile index b09a579159d4..10495940055b 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/expression/persistent_types/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/expression/persistent_types/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/persistent_variables/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/persistent_variables/Makefile index b09a579159d4..10495940055b 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/expression/persistent_variables/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/expression/persistent_variables/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/po_verbosity/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/po_verbosity/Makefile index 242d36fe860f..2f36b673031d 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/expression/po_verbosity/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/expression/po_verbosity/Makefile @@ -1,6 +1,4 @@ -LEVEL = ../../../make - OBJC_SOURCES := main.m -include $(LEVEL)/Makefile.rules +include Makefile.rules LDFLAGS += -framework Foundation diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/pr35310/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/pr35310/Makefile index 314f1cb2f077..99998b20bcb0 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/expression/pr35310/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/expression/pr35310/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/radar_8638051/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/radar_8638051/Makefile index b09a579159d4..10495940055b 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/expression/radar_8638051/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/expression/radar_8638051/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/radar_9531204/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/radar_9531204/Makefile index b09a579159d4..10495940055b 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/expression/radar_9531204/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/expression/radar_9531204/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/radar_9673664/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/radar_9673664/Makefile index b09a579159d4..10495940055b 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/expression/radar_9673664/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/expression/radar_9673664/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/rdar42038760/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/rdar42038760/Makefile index cd9ca5c86d84..c9319d6e6888 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/expression/rdar42038760/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/expression/rdar42038760/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/commands/expression/rdar44436068/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/rdar44436068/Makefile index cd9ca5c86d84..c9319d6e6888 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/expression/rdar44436068/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/expression/rdar44436068/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/commands/expression/save_jit_objects/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/save_jit_objects/Makefile index b09a579159d4..10495940055b 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/expression/save_jit_objects/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/expression/save_jit_objects/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/scoped_enums/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/scoped_enums/Makefile index 80d2f745dada..4b46fe22a8b0 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/expression/scoped_enums/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/expression/scoped_enums/Makefile @@ -1,6 +1,4 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp CXXFLAGS += -std=c++11 -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/test/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/test/Makefile index 314f1cb2f077..99998b20bcb0 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/expression/test/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/expression/test/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/timeout/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/timeout/Makefile index 49138c83c69e..06a21f5b8b4e 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/expression/timeout/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/expression/timeout/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := wait-a-while.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/top-level/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/top-level/Makefile index 68fb539d6d8d..1247a8e09b23 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/expression/top-level/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/expression/top-level/Makefile @@ -1,8 +1,6 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp test.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules a.out: dummy diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/top-level/dummy.mk b/lldb/packages/Python/lldbsuite/test/commands/expression/top-level/dummy.mk index 851e96e6f3af..59a1cff3803e 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/expression/top-level/dummy.mk +++ b/lldb/packages/Python/lldbsuite/test/commands/expression/top-level/dummy.mk @@ -1,6 +1,4 @@ -LEVEL = ../../../make - CXX_SOURCES := dummy.cpp EXE := dummy -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/two-files/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/two-files/Makefile index 22a6e0177651..b8b1d12fe2ba 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/expression/two-files/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/expression/two-files/Makefile @@ -1,7 +1,5 @@ -LEVEL = ../../../make - OBJC_SOURCES := main.m foo.m -include $(LEVEL)/Makefile.rules +include Makefile.rules LDFLAGS += -framework Foundation diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/unicode-in-variable/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/unicode-in-variable/Makefile index 7cc295cc1f4e..7fdd5c2c6ab7 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/expression/unicode-in-variable/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/expression/unicode-in-variable/Makefile @@ -1,4 +1,3 @@ -LEVEL = ../../../make CXX_SOURCES := main.cpp CXX_FLAGS_EXTRA := -finput-charset=UTF-8 -fextended-identifiers -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/unwind_expression/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/unwind_expression/Makefile index 314f1cb2f077..99998b20bcb0 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/expression/unwind_expression/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/expression/unwind_expression/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/vector_of_enums/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/vector_of_enums/Makefile index 314f1cb2f077..99998b20bcb0 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/expression/vector_of_enums/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/expression/vector_of_enums/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/weak_symbols/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/weak_symbols/Makefile index 32f0e9a13ef9..9786ff38a846 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/expression/weak_symbols/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/expression/weak_symbols/Makefile @@ -1,7 +1,6 @@ -LEVEL = ../../../make CFLAGS_EXTRAS += -std=c99 LD_FLAGS := -dynamiclib -include $(LEVEL)/Makefile.rules +include Makefile.rules all: a.out dylib missing diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/xvalue/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/xvalue/Makefile index 314f1cb2f077..99998b20bcb0 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/expression/xvalue/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/expression/xvalue/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/array/Makefile b/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/array/Makefile index 214cedd96f1a..10495940055b 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/array/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/array/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/bad-reference/Makefile b/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/bad-reference/Makefile index ee6b9cc62b40..99998b20bcb0 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/bad-reference/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/bad-reference/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/complicated-expression/Makefile b/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/complicated-expression/Makefile index 214cedd96f1a..10495940055b 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/complicated-expression/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/complicated-expression/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/dereference-argument/Makefile b/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/dereference-argument/Makefile index 214cedd96f1a..10495940055b 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/dereference-argument/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/dereference-argument/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/dereference-function-return/Makefile b/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/dereference-function-return/Makefile index ee6b9cc62b40..99998b20bcb0 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/dereference-function-return/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/dereference-function-return/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/dereference-this/Makefile b/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/dereference-this/Makefile index ee6b9cc62b40..99998b20bcb0 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/dereference-this/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/dereference-this/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/inheritance/Makefile b/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/inheritance/Makefile index ee6b9cc62b40..99998b20bcb0 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/inheritance/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/inheritance/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/local-variable/Makefile b/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/local-variable/Makefile index 214cedd96f1a..10495940055b 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/local-variable/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/local-variable/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/virtual-method-call/Makefile b/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/virtual-method-call/Makefile index ee6b9cc62b40..99998b20bcb0 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/virtual-method-call/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/virtual-method-call/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/frame/language/Makefile b/lldb/packages/Python/lldbsuite/test/commands/frame/language/Makefile index 127cea792d25..993dc3f71a8a 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/frame/language/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/frame/language/Makefile @@ -1,9 +1,7 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp other.cpp other-2.cpp C_SOURCES := somefunc.c -include $(LEVEL)/Makefile.rules +include Makefile.rules other-2.o: other-2.cpp $(CXX) $(CFLAGS_NO_DEBUG) -c $(SRCDIR)/other-2.cpp diff --git a/lldb/packages/Python/lldbsuite/test/commands/frame/recognizer/Makefile b/lldb/packages/Python/lldbsuite/test/commands/frame/recognizer/Makefile index 5f36c6a9a685..b016328910ea 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/frame/recognizer/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/frame/recognizer/Makefile @@ -1,10 +1,8 @@ -LEVEL = ../../../make - OBJC_SOURCES := main.m CFLAGS_EXTRAS += -g0 # No debug info. MAKE_DSYM := NO -include $(LEVEL)/Makefile.rules +include Makefile.rules LDFLAGS += -framework Foundation diff --git a/lldb/packages/Python/lldbsuite/test/commands/frame/select/Makefile b/lldb/packages/Python/lldbsuite/test/commands/frame/select/Makefile index 99bfa7e03b47..3d0b98f13f3d 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/frame/select/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/frame/select/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/commands/frame/var-scope/Makefile b/lldb/packages/Python/lldbsuite/test/commands/frame/var-scope/Makefile index cd9ca5c86d84..c9319d6e6888 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/frame/var-scope/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/frame/var-scope/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/commands/frame/var/Makefile b/lldb/packages/Python/lldbsuite/test/commands/frame/var/Makefile index 6067ee45e984..aa5f222c08e3 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/frame/var/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/frame/var/Makefile @@ -1,6 +1,4 @@ -LEVEL = ../../../make - C_SOURCES := main.c CFLAGS_EXTRAS += -std=c99 -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/gui/basic/Makefile b/lldb/packages/Python/lldbsuite/test/commands/gui/basic/Makefile index cd9ca5c86d84..c9319d6e6888 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/gui/basic/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/gui/basic/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/commands/log/basic/Makefile b/lldb/packages/Python/lldbsuite/test/commands/log/basic/Makefile index 314f1cb2f077..99998b20bcb0 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/log/basic/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/log/basic/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/process/attach-resume/Makefile b/lldb/packages/Python/lldbsuite/test/commands/process/attach-resume/Makefile index ea27ca7dec21..dc1d28d1c031 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/process/attach-resume/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/process/attach-resume/Makefile @@ -1,7 +1,5 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp ENABLE_THREADS := YES EXE := AttachResume -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/process/attach/Makefile b/lldb/packages/Python/lldbsuite/test/commands/process/attach/Makefile index 91c895cf68d9..8a52f8fcd470 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/process/attach/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/process/attach/Makefile @@ -1,7 +1,5 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp EXE := ProcessAttach -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/process/attach/attach_denied/Makefile b/lldb/packages/Python/lldbsuite/test/commands/process/attach/attach_denied/Makefile index d7926a984027..a694d36ac0d2 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/process/attach/attach_denied/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/process/attach/attach_denied/Makefile @@ -1,12 +1,10 @@ -LEVEL = ../../../../make - CXX_SOURCES := main.cpp EXE := AttachDenied all: AttachDenied sign -include $(LEVEL)/Makefile.rules +include Makefile.rules sign: entitlements.plist AttachDenied ifeq ($(OS),Darwin) diff --git a/lldb/packages/Python/lldbsuite/test/commands/process/launch-with-shellexpand/Makefile b/lldb/packages/Python/lldbsuite/test/commands/process/launch-with-shellexpand/Makefile index 314f1cb2f077..99998b20bcb0 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/process/launch-with-shellexpand/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/process/launch-with-shellexpand/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/process/launch/Makefile b/lldb/packages/Python/lldbsuite/test/commands/process/launch/Makefile index 54d1c2bf7f35..eff77274c7ba 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/process/launch/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/process/launch/Makefile @@ -1,7 +1,5 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp #CXX_SOURCES := print-cwd.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/register/register/intel_xtended_registers/Makefile b/lldb/packages/Python/lldbsuite/test/commands/register/register/intel_xtended_registers/Makefile index 1c1be94b3d00..202f88e410e3 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/register/register/intel_xtended_registers/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/register/register/intel_xtended_registers/Makefile @@ -1,7 +1,5 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp CFLAGS_EXTRAS += -mmpx -fcheck-pointer-bounds -fuse-ld=bfd -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/register/register/intel_xtended_registers/mpx_bound_violation/Makefile b/lldb/packages/Python/lldbsuite/test/commands/register/register/intel_xtended_registers/mpx_bound_violation/Makefile index aa88c47ff3f6..202f88e410e3 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/register/register/intel_xtended_registers/mpx_bound_violation/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/register/register/intel_xtended_registers/mpx_bound_violation/Makefile @@ -1,7 +1,5 @@ -LEVEL = ../../../../make - CXX_SOURCES := main.cpp CFLAGS_EXTRAS += -mmpx -fcheck-pointer-bounds -fuse-ld=bfd -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/register/register/register_command/Makefile b/lldb/packages/Python/lldbsuite/test/commands/register/register/register_command/Makefile index 3ff68584fd82..d2bc2ba44a03 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/register/register/register_command/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/register/register/register_command/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../../make - CXX_SOURCES := main.cpp a.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/settings/Makefile b/lldb/packages/Python/lldbsuite/test/commands/settings/Makefile index 8a7102e347af..99998b20bcb0 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/settings/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/settings/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/settings/quoting/Makefile b/lldb/packages/Python/lldbsuite/test/commands/settings/quoting/Makefile index b09a579159d4..10495940055b 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/settings/quoting/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/settings/quoting/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/source/info/Makefile b/lldb/packages/Python/lldbsuite/test/commands/source/info/Makefile index faf0ed5765f4..40543b2593f0 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/source/info/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/source/info/Makefile @@ -1,3 +1,2 @@ -LEVEL = ../../../make CXX_SOURCES := main.cpp second.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/statistics/basic/Makefile b/lldb/packages/Python/lldbsuite/test/commands/statistics/basic/Makefile index cd9ca5c86d84..c9319d6e6888 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/statistics/basic/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/statistics/basic/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/commands/target/basic/Makefile b/lldb/packages/Python/lldbsuite/test/commands/target/basic/Makefile index 59375dd6db88..b31e594019f6 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/target/basic/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/target/basic/Makefile @@ -1,8 +1,6 @@ -LEVEL = ../../../make - # Example: # # C_SOURCES := b.c # EXE := b.out -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/target/create-deps/Makefile b/lldb/packages/Python/lldbsuite/test/commands/target/create-deps/Makefile index ca017e07ae3b..aa9922b390a7 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/target/create-deps/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/target/create-deps/Makefile @@ -1,11 +1,9 @@ -LEVEL := ../../../make - LIB_PREFIX := load_ LD_EXTRAS := -L. -l$(LIB_PREFIX)a CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules a.out: lib_a diff --git a/lldb/packages/Python/lldbsuite/test/commands/target/create-deps/a.mk b/lldb/packages/Python/lldbsuite/test/commands/target/create-deps/a.mk index faec3bbfc3ef..80756bbe8f29 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/target/create-deps/a.mk +++ b/lldb/packages/Python/lldbsuite/test/commands/target/create-deps/a.mk @@ -1,9 +1,7 @@ -LEVEL := ../../../make - LIB_PREFIX := load_ DYLIB_NAME := $(LIB_PREFIX)a DYLIB_CXX_SOURCES := a.cpp DYLIB_ONLY := YES -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/target/create-no-such-arch/Makefile b/lldb/packages/Python/lldbsuite/test/commands/target/create-no-such-arch/Makefile index 314f1cb2f077..99998b20bcb0 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/target/create-no-such-arch/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/target/create-no-such-arch/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/target/stop-hooks/Makefile b/lldb/packages/Python/lldbsuite/test/commands/target/stop-hooks/Makefile index 6067ee45e984..aa5f222c08e3 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/target/stop-hooks/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/target/stop-hooks/Makefile @@ -1,6 +1,4 @@ -LEVEL = ../../../make - C_SOURCES := main.c CFLAGS_EXTRAS += -std=c99 -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/watchpoints/hello_watchlocation/Makefile b/lldb/packages/Python/lldbsuite/test/commands/watchpoints/hello_watchlocation/Makefile index 8817fff55e8c..de4ec12b13cb 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/watchpoints/hello_watchlocation/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/watchpoints/hello_watchlocation/Makefile @@ -1,6 +1,4 @@ -LEVEL = ../../../make - ENABLE_THREADS := YES CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/watchpoints/hello_watchpoint/Makefile b/lldb/packages/Python/lldbsuite/test/commands/watchpoints/hello_watchpoint/Makefile index b09a579159d4..10495940055b 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/watchpoints/hello_watchpoint/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/watchpoints/hello_watchpoint/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/watchpoints/multi_watchpoint_slots/Makefile b/lldb/packages/Python/lldbsuite/test/commands/watchpoints/multi_watchpoint_slots/Makefile index b09a579159d4..10495940055b 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/watchpoints/multi_watchpoint_slots/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/watchpoints/multi_watchpoint_slots/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/watchpoints/multiple_hits/Makefile b/lldb/packages/Python/lldbsuite/test/commands/watchpoints/multiple_hits/Makefile index 314f1cb2f077..99998b20bcb0 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/watchpoints/multiple_hits/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/watchpoints/multiple_hits/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/watchpoints/multiple_threads/Makefile b/lldb/packages/Python/lldbsuite/test/commands/watchpoints/multiple_threads/Makefile index 8817fff55e8c..de4ec12b13cb 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/watchpoints/multiple_threads/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/watchpoints/multiple_threads/Makefile @@ -1,6 +1,4 @@ -LEVEL = ../../../make - ENABLE_THREADS := YES CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/watchpoints/step_over_watchpoint/Makefile b/lldb/packages/Python/lldbsuite/test/commands/watchpoints/step_over_watchpoint/Makefile index b09a579159d4..10495940055b 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/watchpoints/step_over_watchpoint/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/watchpoints/step_over_watchpoint/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/watchpoints/variable_out_of_scope/Makefile b/lldb/packages/Python/lldbsuite/test/commands/watchpoints/variable_out_of_scope/Makefile index b09a579159d4..10495940055b 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/watchpoints/variable_out_of_scope/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/watchpoints/variable_out_of_scope/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_commands/Makefile b/lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_commands/Makefile index b09a579159d4..10495940055b 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_commands/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_commands/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_commands/command/Makefile b/lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_commands/command/Makefile index ee6b9cc62b40..99998b20bcb0 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_commands/command/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_commands/command/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_commands/condition/Makefile b/lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_commands/condition/Makefile index ee6b9cc62b40..99998b20bcb0 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_commands/condition/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_commands/condition/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_disable/Makefile b/lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_disable/Makefile index b09a579159d4..10495940055b 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_disable/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_disable/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_events/Makefile b/lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_events/Makefile index b09a579159d4..10495940055b 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_events/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_events/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_on_vectors/Makefile b/lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_on_vectors/Makefile index b09a579159d4..10495940055b 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_on_vectors/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_on_vectors/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_set_command/Makefile b/lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_set_command/Makefile index 8817fff55e8c..de4ec12b13cb 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_set_command/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_set_command/Makefile @@ -1,6 +1,4 @@ -LEVEL = ../../../make - ENABLE_THREADS := YES CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_size/Makefile b/lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_size/Makefile index b09a579159d4..10495940055b 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_size/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_size/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/driver/batch_mode/Makefile b/lldb/packages/Python/lldbsuite/test/driver/batch_mode/Makefile index 0d70f2595019..10495940055b 100644 --- a/lldb/packages/Python/lldbsuite/test/driver/batch_mode/Makefile +++ b/lldb/packages/Python/lldbsuite/test/driver/batch_mode/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/archives/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/archives/Makefile index 64da83becbda..4d1950cf34aa 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/archives/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/archives/Makefile @@ -1,9 +1,7 @@ -LEVEL = ../../make - C_SOURCES := main.c MAKE_DSYM := NO ARCHIVE_NAME := libfoo.a ARCHIVE_C_SOURCES := a.c b.c -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/asan/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/asan/Makefile index dc8d682f831a..4913a18d8cc6 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/asan/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/asan/Makefile @@ -1,6 +1,4 @@ -LEVEL = ../../make - C_SOURCES := main.c CFLAGS_EXTRAS := -fsanitize=address -g -gcolumn-info -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/avoids-fd-leak/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/avoids-fd-leak/Makefile index 0d70f2595019..10495940055b 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/avoids-fd-leak/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/avoids-fd-leak/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/completion/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/completion/Makefile index 8a7102e347af..99998b20bcb0 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/completion/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/completion/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/conditional_break/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/conditional_break/Makefile index 0d70f2595019..10495940055b 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/conditional_break/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/conditional_break/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/basic/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/basic/Makefile index b09a579159d4..10495940055b 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/basic/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/basic/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/exact_match/activity-chain/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/exact_match/activity-chain/Makefile index 4f4176f23f3c..10495940055b 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/exact_match/activity-chain/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/exact_match/activity-chain/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/exact_match/activity/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/exact_match/activity/Makefile index 4f4176f23f3c..10495940055b 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/exact_match/activity/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/exact_match/activity/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/exact_match/category/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/exact_match/category/Makefile index 4f4176f23f3c..10495940055b 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/exact_match/category/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/exact_match/category/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/exact_match/message/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/exact_match/message/Makefile index 4f4176f23f3c..10495940055b 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/exact_match/message/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/exact_match/message/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/exact_match/subsystem/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/exact_match/subsystem/Makefile index 4f4176f23f3c..10495940055b 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/exact_match/subsystem/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/exact_match/subsystem/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/regex/activity-chain/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/regex/activity-chain/Makefile index 4f4176f23f3c..10495940055b 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/regex/activity-chain/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/regex/activity-chain/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/regex/activity/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/regex/activity/Makefile index 4f4176f23f3c..10495940055b 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/regex/activity/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/regex/activity/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/regex/category/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/regex/category/Makefile index 4f4176f23f3c..10495940055b 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/regex/category/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/regex/category/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/regex/message/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/regex/message/Makefile index 4f4176f23f3c..10495940055b 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/regex/message/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/regex/message/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/regex/subsystem/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/regex/subsystem/Makefile index 4f4176f23f3c..10495940055b 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/regex/subsystem/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/regex/subsystem/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/format/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/format/Makefile index b09a579159d4..10495940055b 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/format/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/format/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/source/debug/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/source/debug/Makefile index 214cedd96f1a..10495940055b 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/source/debug/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/source/debug/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/source/info/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/source/info/Makefile index 214cedd96f1a..10495940055b 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/source/info/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/darwin_log/source/info/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/boolreference/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/boolreference/Makefile index 261658b10ae8..377a1a0373a0 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/boolreference/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/boolreference/Makefile @@ -1,9 +1,7 @@ -LEVEL = ../../../make - OBJCXX_SOURCES := main.mm CFLAGS_EXTRAS += -w -include $(LEVEL)/Makefile.rules +include Makefile.rules LDFLAGS += -framework Foundation diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/compactvectors/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/compactvectors/Makefile index 9b06ad7d705a..86bbe461026e 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/compactvectors/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/compactvectors/Makefile @@ -1,7 +1,5 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules LDFLAGS += -framework Accelerate \ No newline at end of file diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-advanced/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-advanced/Makefile index 314f1cb2f077..99998b20bcb0 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-advanced/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-advanced/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-categories/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-categories/Makefile index 314f1cb2f077..99998b20bcb0 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-categories/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-categories/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-cpp/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-cpp/Makefile index 314f1cb2f077..99998b20bcb0 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-cpp/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-cpp/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-disabling/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-disabling/Makefile index 314f1cb2f077..99998b20bcb0 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-disabling/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-disabling/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-enum-format/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-enum-format/Makefile index 314f1cb2f077..99998b20bcb0 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-enum-format/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-enum-format/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-globals/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-globals/Makefile index 314f1cb2f077..99998b20bcb0 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-globals/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-globals/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-named-summaries/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-named-summaries/Makefile index 314f1cb2f077..99998b20bcb0 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-named-summaries/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-named-summaries/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-objc/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-objc/Makefile index 9f7fb1ca6231..03b578913862 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-objc/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-objc/Makefile @@ -1,9 +1,7 @@ -LEVEL = ../../../make - OBJC_SOURCES := main.m CFLAGS_EXTRAS += -w -include $(LEVEL)/Makefile.rules +include Makefile.rules LDFLAGS += -framework Foundation diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-objc/nsindexpath/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-objc/nsindexpath/Makefile index 0d94c2247f14..03b578913862 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-objc/nsindexpath/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-objc/nsindexpath/Makefile @@ -1,9 +1,7 @@ -LEVEL = ../../../../make - OBJC_SOURCES := main.m CFLAGS_EXTRAS += -w -include $(LEVEL)/Makefile.rules +include Makefile.rules LDFLAGS += -framework Foundation diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-objc/nsstring/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-objc/nsstring/Makefile index 0d94c2247f14..03b578913862 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-objc/nsstring/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-objc/nsstring/Makefile @@ -1,9 +1,7 @@ -LEVEL = ../../../../make - OBJC_SOURCES := main.m CFLAGS_EXTRAS += -w -include $(LEVEL)/Makefile.rules +include Makefile.rules LDFLAGS += -framework Foundation diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-proper-plurals/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-proper-plurals/Makefile index 9f7fb1ca6231..03b578913862 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-proper-plurals/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-proper-plurals/Makefile @@ -1,9 +1,7 @@ -LEVEL = ../../../make - OBJC_SOURCES := main.m CFLAGS_EXTRAS += -w -include $(LEVEL)/Makefile.rules +include Makefile.rules LDFLAGS += -framework Foundation diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-ptr-to-array/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-ptr-to-array/Makefile index 314f1cb2f077..99998b20bcb0 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-ptr-to-array/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-ptr-to-array/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-python-synth/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-python-synth/Makefile index 314f1cb2f077..99998b20bcb0 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-python-synth/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-python-synth/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-script/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-script/Makefile index 314f1cb2f077..99998b20bcb0 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-script/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-script/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-skip-summary/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-skip-summary/Makefile index 637404f1bd0a..720d1b1ca5af 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-skip-summary/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-skip-summary/Makefile @@ -1,8 +1,6 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp USE_LIBSTDCPP := 0 -include $(LEVEL)/Makefile.rules +include Makefile.rules CXXFLAGS += -O0 diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-smart-array/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-smart-array/Makefile index 314f1cb2f077..99998b20bcb0 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-smart-array/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-smart-array/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/atomic/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/atomic/Makefile index fdd717119d95..22307c41c1c3 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/atomic/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/atomic/Makefile @@ -1,5 +1,4 @@ -LEVEL = ../../../../../make CXX_SOURCES := main.cpp CXXFLAGS += -std=c++11 USE_LIBCPP := 1 -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/bitset/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/bitset/Makefile index bf75013f531d..680e1abfbef5 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/bitset/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/bitset/Makefile @@ -1,6 +1,4 @@ -LEVEL = ../../../../../make - CXX_SOURCES := main.cpp USE_LIBCPP := 1 -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/forward_list/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/forward_list/Makefile index bf75013f531d..680e1abfbef5 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/forward_list/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/forward_list/Makefile @@ -1,6 +1,4 @@ -LEVEL = ../../../../../make - CXX_SOURCES := main.cpp USE_LIBCPP := 1 -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/function/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/function/Makefile index fdd717119d95..22307c41c1c3 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/function/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/function/Makefile @@ -1,5 +1,4 @@ -LEVEL = ../../../../../make CXX_SOURCES := main.cpp CXXFLAGS += -std=c++11 USE_LIBCPP := 1 -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/initializerlist/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/initializerlist/Makefile index d37bef7dc5cc..29c68ae57401 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/initializerlist/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/initializerlist/Makefile @@ -1,4 +1,3 @@ -LEVEL = ../../../../../make CXX_SOURCES := main.cpp CXXFLAGS += -std=c++11 -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/iterator/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/iterator/Makefile index 1f609a41d908..4a33784693a2 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/iterator/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/iterator/Makefile @@ -1,7 +1,5 @@ -LEVEL = ../../../../../make - CXX_SOURCES := main.cpp USE_LIBCPP := 1 -include $(LEVEL)/Makefile.rules +include Makefile.rules CXXFLAGS += -O0 diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/list/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/list/Makefile index 1f609a41d908..4a33784693a2 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/list/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/list/Makefile @@ -1,7 +1,5 @@ -LEVEL = ../../../../../make - CXX_SOURCES := main.cpp USE_LIBCPP := 1 -include $(LEVEL)/Makefile.rules +include Makefile.rules CXXFLAGS += -O0 diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/list/loop/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/list/loop/Makefile index a5dabdb6349d..4a33784693a2 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/list/loop/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/list/loop/Makefile @@ -1,7 +1,5 @@ -LEVEL = ../../../../../../make - CXX_SOURCES := main.cpp USE_LIBCPP := 1 -include $(LEVEL)/Makefile.rules +include Makefile.rules CXXFLAGS += -O0 diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/map/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/map/Makefile index 1f609a41d908..4a33784693a2 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/map/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/map/Makefile @@ -1,7 +1,5 @@ -LEVEL = ../../../../../make - CXX_SOURCES := main.cpp USE_LIBCPP := 1 -include $(LEVEL)/Makefile.rules +include Makefile.rules CXXFLAGS += -O0 diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/multimap/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/multimap/Makefile index 1f609a41d908..4a33784693a2 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/multimap/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/multimap/Makefile @@ -1,7 +1,5 @@ -LEVEL = ../../../../../make - CXX_SOURCES := main.cpp USE_LIBCPP := 1 -include $(LEVEL)/Makefile.rules +include Makefile.rules CXXFLAGS += -O0 diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/multiset/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/multiset/Makefile index 1f609a41d908..4a33784693a2 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/multiset/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/multiset/Makefile @@ -1,7 +1,5 @@ -LEVEL = ../../../../../make - CXX_SOURCES := main.cpp USE_LIBCPP := 1 -include $(LEVEL)/Makefile.rules +include Makefile.rules CXXFLAGS += -O0 diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/optional/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/optional/Makefile index 19d6fc3e3c25..5ad5241858d8 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/optional/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/optional/Makefile @@ -1,7 +1,5 @@ -LEVEL = ../../../../../make - CXX_SOURCES := main.cpp USE_LIBCPP := 1 -include $(LEVEL)/Makefile.rules +include Makefile.rules CXXFLAGS += -std=c++17 -fno-exceptions diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/queue/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/queue/Makefile index bf75013f531d..680e1abfbef5 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/queue/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/queue/Makefile @@ -1,6 +1,4 @@ -LEVEL = ../../../../../make - CXX_SOURCES := main.cpp USE_LIBCPP := 1 -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/set/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/set/Makefile index 1f609a41d908..4a33784693a2 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/set/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/set/Makefile @@ -1,7 +1,5 @@ -LEVEL = ../../../../../make - CXX_SOURCES := main.cpp USE_LIBCPP := 1 -include $(LEVEL)/Makefile.rules +include Makefile.rules CXXFLAGS += -O0 diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/string/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/string/Makefile index 937b47ea06b0..8b7b61c59c09 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/string/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/string/Makefile @@ -1,7 +1,5 @@ -LEVEL = ../../../../../make - CXX_SOURCES := main.cpp USE_LIBCPP := 1 -include $(LEVEL)/Makefile.rules +include Makefile.rules CXXFLAGS += -std=c++11 -O0 diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/tuple/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/tuple/Makefile index bf75013f531d..680e1abfbef5 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/tuple/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/tuple/Makefile @@ -1,6 +1,4 @@ -LEVEL = ../../../../../make - CXX_SOURCES := main.cpp USE_LIBCPP := 1 -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/unordered/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/unordered/Makefile index 24d7c220d075..442886ce40f9 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/unordered/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/unordered/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../../../make - CXX_SOURCES := main.cpp # Work around "exception specification in declaration does not match previous @@ -8,5 +6,5 @@ CXX_SOURCES := main.cpp CFLAGS_EXTRAS += -fno-exceptions USE_LIBCPP := 1 -include $(LEVEL)/Makefile.rules +include Makefile.rules CXXFLAGS += -O0 diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/variant/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/variant/Makefile index a6ea665ef63c..3fc4d8027186 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/variant/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/variant/Makefile @@ -1,7 +1,5 @@ -LEVEL = ../../../../../make - CXX_SOURCES := main.cpp USE_LIBCPP := 1 -include $(LEVEL)/Makefile.rules +include Makefile.rules CXXFLAGS += -std=c++17 diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/vbool/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/vbool/Makefile index 637fa7e80bfd..c7df6a4cbf9b 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/vbool/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/vbool/Makefile @@ -1,7 +1,5 @@ -LEVEL = ../../../../../make - CXX_SOURCES := main.cpp USE_LIBCPP := 1 -include $(LEVEL)/Makefile.rules +include Makefile.rules CXXFLAGS += -O0 diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/vector/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/vector/Makefile index 1f609a41d908..4a33784693a2 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/vector/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/vector/Makefile @@ -1,7 +1,5 @@ -LEVEL = ../../../../../make - CXX_SOURCES := main.cpp USE_LIBCPP := 1 -include $(LEVEL)/Makefile.rules +include Makefile.rules CXXFLAGS += -O0 diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/iterator/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/iterator/Makefile index 2e8bcb9079bd..7d43aa33e9ae 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/iterator/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/iterator/Makefile @@ -1,8 +1,6 @@ -LEVEL = ../../../../../make - CXX_SOURCES := main.cpp CFLAGS_EXTRAS += -O0 USE_LIBSTDCPP := 1 -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/list/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/list/Makefile index 2e8bcb9079bd..7d43aa33e9ae 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/list/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/list/Makefile @@ -1,8 +1,6 @@ -LEVEL = ../../../../../make - CXX_SOURCES := main.cpp CFLAGS_EXTRAS += -O0 USE_LIBSTDCPP := 1 -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/map/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/map/Makefile index 17868d8a95fc..bf8e6b8703f3 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/map/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/map/Makefile @@ -1,7 +1,5 @@ -LEVEL = ../../../../../make - CXX_SOURCES := main.cpp USE_LIBSTDCPP := 1 -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/smart_ptr/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/smart_ptr/Makefile index 63f2aaf9c75a..654e4b15bd56 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/smart_ptr/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/smart_ptr/Makefile @@ -1,8 +1,6 @@ -LEVEL = ../../../../../make - CXX_SOURCES := main.cpp CXXFLAGS := -O0 USE_LIBSTDCPP := 1 -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/string/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/string/Makefile index 2e8bcb9079bd..7d43aa33e9ae 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/string/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/string/Makefile @@ -1,8 +1,6 @@ -LEVEL = ../../../../../make - CXX_SOURCES := main.cpp CFLAGS_EXTRAS += -O0 USE_LIBSTDCPP := 1 -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/tuple/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/tuple/Makefile index 17868d8a95fc..bf8e6b8703f3 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/tuple/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/tuple/Makefile @@ -1,7 +1,5 @@ -LEVEL = ../../../../../make - CXX_SOURCES := main.cpp USE_LIBSTDCPP := 1 -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/unique_ptr/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/unique_ptr/Makefile index 17868d8a95fc..bf8e6b8703f3 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/unique_ptr/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/unique_ptr/Makefile @@ -1,7 +1,5 @@ -LEVEL = ../../../../../make - CXX_SOURCES := main.cpp USE_LIBSTDCPP := 1 -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/vbool/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/vbool/Makefile index 2e8bcb9079bd..7d43aa33e9ae 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/vbool/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/vbool/Makefile @@ -1,8 +1,6 @@ -LEVEL = ../../../../../make - CXX_SOURCES := main.cpp CFLAGS_EXTRAS += -O0 USE_LIBSTDCPP := 1 -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/vector/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/vector/Makefile index 63f2aaf9c75a..654e4b15bd56 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/vector/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/vector/Makefile @@ -1,8 +1,6 @@ -LEVEL = ../../../../../make - CXX_SOURCES := main.cpp CXXFLAGS := -O0 USE_LIBSTDCPP := 1 -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-synth/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-synth/Makefile index 314f1cb2f077..99998b20bcb0 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-synth/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-synth/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-synthtype/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-synthtype/Makefile index 314f1cb2f077..99998b20bcb0 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-synthtype/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-synthtype/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-synthval/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-synthval/Makefile index 314f1cb2f077..99998b20bcb0 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-synthval/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-synthval/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/dump_dynamic/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/dump_dynamic/Makefile index 872bf6d20877..4b46fe22a8b0 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/dump_dynamic/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/dump_dynamic/Makefile @@ -1,5 +1,4 @@ -LEVEL = ../../../make CXX_SOURCES := main.cpp CXXFLAGS += -std=c++11 -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/format-propagation/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/format-propagation/Makefile index 314f1cb2f077..99998b20bcb0 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/format-propagation/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/format-propagation/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/frameformat_smallstruct/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/frameformat_smallstruct/Makefile index 314f1cb2f077..99998b20bcb0 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/frameformat_smallstruct/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/frameformat_smallstruct/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/hexcaps/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/hexcaps/Makefile index 314f1cb2f077..99998b20bcb0 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/hexcaps/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/hexcaps/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/language_category_updates/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/language_category_updates/Makefile index 314f1cb2f077..99998b20bcb0 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/language_category_updates/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/language_category_updates/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/nsarraysynth/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/nsarraysynth/Makefile index 9f7fb1ca6231..03b578913862 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/nsarraysynth/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/nsarraysynth/Makefile @@ -1,9 +1,7 @@ -LEVEL = ../../../make - OBJC_SOURCES := main.m CFLAGS_EXTRAS += -w -include $(LEVEL)/Makefile.rules +include Makefile.rules LDFLAGS += -framework Foundation diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/nsdictionarysynth/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/nsdictionarysynth/Makefile index 9f7fb1ca6231..03b578913862 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/nsdictionarysynth/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/nsdictionarysynth/Makefile @@ -1,9 +1,7 @@ -LEVEL = ../../../make - OBJC_SOURCES := main.m CFLAGS_EXTRAS += -w -include $(LEVEL)/Makefile.rules +include Makefile.rules LDFLAGS += -framework Foundation diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/nssetsynth/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/nssetsynth/Makefile index 9f7fb1ca6231..03b578913862 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/nssetsynth/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/nssetsynth/Makefile @@ -1,9 +1,7 @@ -LEVEL = ../../../make - OBJC_SOURCES := main.m CFLAGS_EXTRAS += -w -include $(LEVEL)/Makefile.rules +include Makefile.rules LDFLAGS += -framework Foundation diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/ostypeformatting/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/ostypeformatting/Makefile index 261658b10ae8..377a1a0373a0 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/ostypeformatting/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/ostypeformatting/Makefile @@ -1,9 +1,7 @@ -LEVEL = ../../../make - OBJCXX_SOURCES := main.mm CFLAGS_EXTRAS += -w -include $(LEVEL)/Makefile.rules +include Makefile.rules LDFLAGS += -framework Foundation diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/parray/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/parray/Makefile index 314f1cb2f077..99998b20bcb0 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/parray/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/parray/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/poarray/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/poarray/Makefile index 261658b10ae8..377a1a0373a0 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/poarray/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/poarray/Makefile @@ -1,9 +1,7 @@ -LEVEL = ../../../make - OBJCXX_SOURCES := main.mm CFLAGS_EXTRAS += -w -include $(LEVEL)/Makefile.rules +include Makefile.rules LDFLAGS += -framework Foundation diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/ptr_ref_typedef/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/ptr_ref_typedef/Makefile index d85e665333ea..348edcd88b44 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/ptr_ref_typedef/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/ptr_ref_typedef/Makefile @@ -1,7 +1,5 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp CFLAGS_EXTRAS += -std=c++11 -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/pyobjsynthprovider/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/pyobjsynthprovider/Makefile index 314f1cb2f077..99998b20bcb0 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/pyobjsynthprovider/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/pyobjsynthprovider/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/refpointer-recursion/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/refpointer-recursion/Makefile index 314f1cb2f077..99998b20bcb0 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/refpointer-recursion/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/refpointer-recursion/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/setvaluefromcstring/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/setvaluefromcstring/Makefile index 62a57f6cd9be..d23d47afaabc 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/setvaluefromcstring/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/setvaluefromcstring/Makefile @@ -1,4 +1,3 @@ -LEVEL = ../../../make OBJC_SOURCES := main.m -include $(LEVEL)/Makefile.rules +include Makefile.rules LDFLAGS += -framework Foundation diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/stringprinter/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/stringprinter/Makefile index 872bf6d20877..4b46fe22a8b0 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/stringprinter/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/stringprinter/Makefile @@ -1,5 +1,4 @@ -LEVEL = ../../../make CXX_SOURCES := main.cpp CXXFLAGS += -std=c++11 -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/summary-string-onfail/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/summary-string-onfail/Makefile index 314f1cb2f077..99998b20bcb0 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/summary-string-onfail/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/summary-string-onfail/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/synthcapping/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/synthcapping/Makefile index 314f1cb2f077..99998b20bcb0 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/synthcapping/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/synthcapping/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/synthupdate/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/synthupdate/Makefile index a8e1853a1290..9048c7205237 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/synthupdate/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/synthupdate/Makefile @@ -1,10 +1,8 @@ -LEVEL = ../../../make - OBJC_SOURCES := main.m CFLAGS_EXTRAS += -w -include $(LEVEL)/Makefile.rules +include Makefile.rules LDFLAGS += -framework Foundation diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/type_summary_list_script/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/type_summary_list_script/Makefile index 314f1cb2f077..99998b20bcb0 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/type_summary_list_script/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/type_summary_list_script/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/typedef_array/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/typedef_array/Makefile index 3e2b0187b954..29c68ae57401 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/typedef_array/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/typedef_array/Makefile @@ -1,4 +1,3 @@ -LEVEL = ../../../make CXX_SOURCES := main.cpp CXXFLAGS += -std=c++11 -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/user-format-vs-summary/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/user-format-vs-summary/Makefile index 314f1cb2f077..99998b20bcb0 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/user-format-vs-summary/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/user-format-vs-summary/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/var-in-aggregate-misuse/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/var-in-aggregate-misuse/Makefile index 314f1cb2f077..99998b20bcb0 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/var-in-aggregate-misuse/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/var-in-aggregate-misuse/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/varscript_formatting/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/varscript_formatting/Makefile index 314f1cb2f077..99998b20bcb0 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/varscript_formatting/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/varscript_formatting/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/vector-types/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/vector-types/Makefile index 314f1cb2f077..99998b20bcb0 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/vector-types/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/vector-types/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +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 c60ecd414635..c39b681d1870 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/dead-strip/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/dead-strip/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../make - C_SOURCES := main.c ifeq "$(OS)" "" @@ -15,4 +13,4 @@ endif MAKE_DSYM := NO -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/deleted-executable/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/deleted-executable/Makefile index 8a7102e347af..99998b20bcb0 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/deleted-executable/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/deleted-executable/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/dynamic_value_child_count/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/dynamic_value_child_count/Makefile index ceb406ee2eab..2bba8e757f79 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/dynamic_value_child_count/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/dynamic_value_child_count/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../make - CXX_SOURCES := pass-to-base.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/exec/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/exec/Makefile index 784a53da4776..b3af2bb69fe0 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/exec/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/exec/Makefile @@ -1,10 +1,8 @@ -LEVEL = ../../make - CXX_SOURCES := main.cpp all: a.out secondprog -include $(LEVEL)/Makefile.rules +include Makefile.rules secondprog: $(MAKE) VPATH=$(VPATH) -f $(SRCDIR)/secondprog.mk diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/exec/secondprog.mk b/lldb/packages/Python/lldbsuite/test/functionalities/exec/secondprog.mk index 88f76b5113b4..63efccc68ede 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/exec/secondprog.mk +++ b/lldb/packages/Python/lldbsuite/test/functionalities/exec/secondprog.mk @@ -1,6 +1,4 @@ -LEVEL = ../../make - CXX_SOURCES := secondprog.cpp EXE = secondprog -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/fat_archives/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/fat_archives/Makefile index c7c5ef405459..7fed83dc9eb0 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/fat_archives/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/fat_archives/Makefile @@ -1,5 +1,4 @@ SRCDIR := $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))/ - all: a.c clean $(CC) -arch i386 -g -c $(SRCDIR)/a.c ar -q liba-i386.a a.o diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/inferior-assert/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/inferior-assert/Makefile index 0d70f2595019..10495940055b 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/inferior-assert/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/inferior-assert/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/inferior-changed/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/inferior-changed/Makefile index 0d70f2595019..10495940055b 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/inferior-changed/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/inferior-changed/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/inferior-crashing/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/inferior-crashing/Makefile index 0d70f2595019..10495940055b 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/inferior-crashing/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/inferior-crashing/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/inferior-crashing/recursive-inferior/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/inferior-crashing/recursive-inferior/Makefile index 0f8e92e9193c..62c0a39c94a4 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/inferior-crashing/recursive-inferior/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/inferior-crashing/recursive-inferior/Makefile @@ -1,7 +1,5 @@ -LEVEL = ../../../make - C_SOURCES := main.c CFLAGS_EXTRAS += -fomit-frame-pointer -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/inline-stepping/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/inline-stepping/Makefile index 532f49555e5f..d94874a7a05c 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/inline-stepping/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/inline-stepping/Makefile @@ -1,9 +1,7 @@ -LEVEL = ../../make - CXX_SOURCES := calling.cpp ifneq (,$(findstring icc,$(CC))) CXXFLAGS += -debug inline-debug-info endif -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/jitloader_gdb/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/jitloader_gdb/Makefile index f94c29bd44d3..a783487bd1c3 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/jitloader_gdb/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/jitloader_gdb/Makefile @@ -1,10 +1,8 @@ -LEVEL = ../../make - C_SOURCES := main.c all: a.out simple -include $(LEVEL)/Makefile.rules +include Makefile.rules simple: $(MAKE) VPATH=$(VPATH) -f $(SRCDIR)/simple.mk diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/jitloader_gdb/simple.mk b/lldb/packages/Python/lldbsuite/test/functionalities/jitloader_gdb/simple.mk index 9f0c165515ad..e2043c3b9c6d 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/jitloader_gdb/simple.mk +++ b/lldb/packages/Python/lldbsuite/test/functionalities/jitloader_gdb/simple.mk @@ -1,6 +1,4 @@ -LEVEL = ../../make - C_SOURCES := simple.c EXE = simple -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/load_unload/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/load_unload/Makefile index 6574478c8f47..cf6b391cb187 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/load_unload/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/load_unload/Makefile @@ -1,12 +1,10 @@ -LEVEL := ../../make - LIB_PREFIX := loadunload_ LD_EXTRAS := -L. -l$(LIB_PREFIX)d CXX_SOURCES := main.cpp USE_LIBDL := 1 -include $(LEVEL)/Makefile.rules +include Makefile.rules a.out: lib_a lib_b lib_c lib_d hidden_lib_d install_name_tool diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/load_unload/a.mk b/lldb/packages/Python/lldbsuite/test/functionalities/load_unload/a.mk index fddca925dea2..6ee9dc41a108 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/load_unload/a.mk +++ b/lldb/packages/Python/lldbsuite/test/functionalities/load_unload/a.mk @@ -1,5 +1,3 @@ -LEVEL := ../../make - LIB_PREFIX := loadunload_ LD_EXTRAS := -L. -l$(LIB_PREFIX)b @@ -8,7 +6,7 @@ DYLIB_NAME := $(LIB_PREFIX)a DYLIB_CXX_SOURCES := a.cpp DYLIB_ONLY := YES -include $(LEVEL)/Makefile.rules +include Makefile.rules $(DYLIB_FILENAME): lib_b diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/load_unload/b.mk b/lldb/packages/Python/lldbsuite/test/functionalities/load_unload/b.mk index 2fcdbea3a1c4..9d36fcac8efd 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/load_unload/b.mk +++ b/lldb/packages/Python/lldbsuite/test/functionalities/load_unload/b.mk @@ -1,9 +1,7 @@ -LEVEL := ../../make - LIB_PREFIX := loadunload_ DYLIB_NAME := $(LIB_PREFIX)b DYLIB_CXX_SOURCES := b.cpp DYLIB_ONLY := YES -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/load_unload/c.mk b/lldb/packages/Python/lldbsuite/test/functionalities/load_unload/c.mk index d40949b14630..0869ab615828 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/load_unload/c.mk +++ b/lldb/packages/Python/lldbsuite/test/functionalities/load_unload/c.mk @@ -1,9 +1,7 @@ -LEVEL := ../../make - LIB_PREFIX := loadunload_ DYLIB_NAME := $(LIB_PREFIX)c DYLIB_CXX_SOURCES := c.cpp DYLIB_ONLY := YES -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/load_unload/d.mk b/lldb/packages/Python/lldbsuite/test/functionalities/load_unload/d.mk index a5db3c7c31f0..111988a314d5 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/load_unload/d.mk +++ b/lldb/packages/Python/lldbsuite/test/functionalities/load_unload/d.mk @@ -1,5 +1,3 @@ -LEVEL := ../../make - LIB_PREFIX := loadunload_ DYLIB_EXECUTABLE_PATH := $(CURDIR) @@ -8,4 +6,4 @@ DYLIB_NAME := $(LIB_PREFIX)d DYLIB_CXX_SOURCES := d.cpp DYLIB_ONLY := YES -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/load_unload/hidden/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/load_unload/hidden/Makefile index 271117a0ad88..17fe6582a9eb 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/load_unload/hidden/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/load_unload/hidden/Makefile @@ -1,9 +1,7 @@ -LEVEL := ../../../make - LIB_PREFIX := loadunload_ DYLIB_NAME := $(LIB_PREFIX)d DYLIB_CXX_SOURCES := d.cpp DYLIB_ONLY := YES -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/load_using_paths/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/load_using_paths/Makefile index 0b7e66870303..ff8e6268d573 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/load_using_paths/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/load_using_paths/Makefile @@ -1,9 +1,7 @@ -LEVEL := ../../make - CXX_SOURCES := main.cpp USE_LIBDL := 1 -include $(LEVEL)/Makefile.rules +include Makefile.rules all: hidden_lib a.out diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/load_using_paths/hidden/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/load_using_paths/hidden/Makefile index bebfa92ecfb2..5e22c8a8ea78 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/load_using_paths/hidden/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/load_using_paths/hidden/Makefile @@ -1,7 +1,5 @@ -LEVEL := ../../../make - DYLIB_NAME := loadunload DYLIB_CXX_SOURCES := d.cpp DYLIB_ONLY := YES -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/longjmp/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/longjmp/Makefile index 0d70f2595019..10495940055b 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/longjmp/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/longjmp/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/memory-region/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/memory-region/Makefile index 9d4f3b7f1412..31f2d5e8fc29 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/memory-region/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/memory-region/Makefile @@ -1,8 +1,6 @@ -LEVEL = ../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules clean:: rm -rf $(wildcard *.o *.d *.dSYM) diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/memory/cache/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/memory/cache/Makefile index 314f1cb2f077..99998b20bcb0 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/memory/cache/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/memory/cache/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/memory/find/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/memory/find/Makefile index 314f1cb2f077..99998b20bcb0 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/memory/find/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/memory/find/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/memory/read/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/memory/read/Makefile index 314f1cb2f077..99998b20bcb0 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/memory/read/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/memory/read/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/mtc/simple/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/mtc/simple/Makefile index 5665652329dc..5a7351146d24 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/mtc/simple/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/mtc/simple/Makefile @@ -1,6 +1,4 @@ -LEVEL = ../../../make - OBJC_SOURCES := main.m LDFLAGS = $(CFLAGS) -lobjc -framework Foundation -framework AppKit -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/non-overlapping-index-variable-i/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/non-overlapping-index-variable-i/Makefile index 8a7102e347af..99998b20bcb0 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/non-overlapping-index-variable-i/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/non-overlapping-index-variable-i/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/plugins/command_plugin/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/plugins/command_plugin/Makefile index 8af06446ecef..3119c3707841 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/plugins/command_plugin/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/plugins/command_plugin/Makefile @@ -1,8 +1,6 @@ -LEVEL = ../../../make - DYLIB_CXX_SOURCES := plugin.cpp DYLIB_NAME := plugin DYLIB_ONLY := YES MAKE_DSYM := NO -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/plugins/python_os_plugin/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/plugins/python_os_plugin/Makefile index cd9ca5c86d84..c9319d6e6888 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/plugins/python_os_plugin/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/plugins/python_os_plugin/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/postmortem/elf-core/gcore/main.mk b/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/elf-core/gcore/main.mk index ff874a21f760..566938ca0cc4 100755 --- a/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/elf-core/gcore/main.mk +++ b/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/elf-core/gcore/main.mk @@ -1,5 +1,3 @@ -LEVEL = ../../../../make - CXX_SOURCES := main.cpp ENABLE_THREADS := YES -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/elf-core/thread_crash/main.mk b/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/elf-core/thread_crash/main.mk index ff874a21f760..566938ca0cc4 100755 --- a/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/elf-core/thread_crash/main.mk +++ b/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/elf-core/thread_crash/main.mk @@ -1,5 +1,3 @@ -LEVEL = ../../../../make - CXX_SOURCES := main.cpp ENABLE_THREADS := YES -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/minidump/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/minidump/Makefile index b3034c12abd9..65e9dd2fa9e3 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/minidump/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/minidump/Makefile @@ -1,6 +1,4 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/pre_run_dylibs/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/pre_run_dylibs/Makefile index 624a6e1584e4..032f9cda29cd 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/pre_run_dylibs/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/pre_run_dylibs/Makefile @@ -1,6 +1,4 @@ -LEVEL = ../../make - DYLIB_NAME := unlikely_name DYLIB_CXX_SOURCES := foo.cpp CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/process_group/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/process_group/Makefile index 0d70f2595019..10495940055b 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/process_group/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/process_group/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/process_save_core/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/process_save_core/Makefile index b76d2cdb93f1..65e9dd2fa9e3 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/process_save_core/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/process_save_core/Makefile @@ -1,6 +1,4 @@ -LEVEL = ../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/ptr_refs/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/ptr_refs/Makefile index 0d70f2595019..10495940055b 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/ptr_refs/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/ptr_refs/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/recursion/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/recursion/Makefile index 8a7102e347af..99998b20bcb0 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/recursion/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/recursion/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/rerun/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/rerun/Makefile index 8a7102e347af..99998b20bcb0 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/rerun/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/rerun/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/return-value/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/return-value/Makefile index fd4e30863465..138642ce2062 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/return-value/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/return-value/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../make - CXX_SOURCES := call-func.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/set-data/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/set-data/Makefile index 9e1d63a183bc..7202932571dc 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/set-data/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/set-data/Makefile @@ -1,7 +1,5 @@ -LEVEL = ../../make - OBJC_SOURCES := main.m -include $(LEVEL)/Makefile.rules +include Makefile.rules LDFLAGS += -framework Foundation diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/signal/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/signal/Makefile index 0d70f2595019..10495940055b 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/signal/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/signal/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/signal/handle-abrt/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/signal/handle-abrt/Makefile index b09a579159d4..10495940055b 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/signal/handle-abrt/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/signal/handle-abrt/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/signal/handle-segv/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/signal/handle-segv/Makefile index b09a579159d4..10495940055b 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/signal/handle-segv/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/signal/handle-segv/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/signal/raise/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/signal/raise/Makefile index b09a579159d4..10495940055b 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/signal/raise/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/signal/raise/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/stats_api/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/stats_api/Makefile index f5a47fcc46cc..c9319d6e6888 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/stats_api/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/stats_api/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/step-avoids-no-debug/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/step-avoids-no-debug/Makefile index 4f71dc87646d..374e58b89a81 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/step-avoids-no-debug/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/step-avoids-no-debug/Makefile @@ -1,8 +1,6 @@ -LEVEL = ../../make - C_SOURCES := with-debug.c without-debug.c -include $(LEVEL)/Makefile.rules +include Makefile.rules without-debug.o: without-debug.c $(CC) $(CFLAGS_NO_DEBUG) -c $< diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/step_scripted/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/step_scripted/Makefile index 0d70f2595019..10495940055b 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/step_scripted/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/step_scripted/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/ambiguous_tail_call_seq1/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/ambiguous_tail_call_seq1/Makefile index 15bc2e7f415b..41c46c6626b3 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/ambiguous_tail_call_seq1/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/ambiguous_tail_call_seq1/Makefile @@ -1,4 +1,3 @@ -LEVEL = ../../../make CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules CXXFLAGS += -g -O1 -glldb diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/ambiguous_tail_call_seq2/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/ambiguous_tail_call_seq2/Makefile index 15bc2e7f415b..41c46c6626b3 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/ambiguous_tail_call_seq2/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/ambiguous_tail_call_seq2/Makefile @@ -1,4 +1,3 @@ -LEVEL = ../../../make CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules CXXFLAGS += -g -O1 -glldb diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/disambiguate_call_site/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/disambiguate_call_site/Makefile index 15bc2e7f415b..41c46c6626b3 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/disambiguate_call_site/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/disambiguate_call_site/Makefile @@ -1,4 +1,3 @@ -LEVEL = ../../../make CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules CXXFLAGS += -g -O1 -glldb diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/disambiguate_paths_to_common_sink/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/disambiguate_paths_to_common_sink/Makefile index 15bc2e7f415b..41c46c6626b3 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/disambiguate_paths_to_common_sink/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/disambiguate_paths_to_common_sink/Makefile @@ -1,4 +1,3 @@ -LEVEL = ../../../make CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules CXXFLAGS += -g -O1 -glldb diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/disambiguate_tail_call_seq/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/disambiguate_tail_call_seq/Makefile index 15bc2e7f415b..41c46c6626b3 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/disambiguate_tail_call_seq/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/disambiguate_tail_call_seq/Makefile @@ -1,4 +1,3 @@ -LEVEL = ../../../make CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules CXXFLAGS += -g -O1 -glldb diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/inlining_and_tail_calls/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/inlining_and_tail_calls/Makefile index 15bc2e7f415b..41c46c6626b3 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/inlining_and_tail_calls/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/inlining_and_tail_calls/Makefile @@ -1,4 +1,3 @@ -LEVEL = ../../../make CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules CXXFLAGS += -g -O1 -glldb diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/sbapi_support/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/sbapi_support/Makefile index 15bc2e7f415b..41c46c6626b3 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/sbapi_support/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/sbapi_support/Makefile @@ -1,4 +1,3 @@ -LEVEL = ../../../make CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules CXXFLAGS += -g -O1 -glldb diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/thread_step_out_message/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/thread_step_out_message/Makefile index 15bc2e7f415b..41c46c6626b3 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/thread_step_out_message/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/thread_step_out_message/Makefile @@ -1,4 +1,3 @@ -LEVEL = ../../../make CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules CXXFLAGS += -g -O1 -glldb diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/thread_step_out_or_return/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/thread_step_out_or_return/Makefile index 15bc2e7f415b..41c46c6626b3 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/thread_step_out_or_return/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/thread_step_out_or_return/Makefile @@ -1,4 +1,3 @@ -LEVEL = ../../../make CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules CXXFLAGS += -g -O1 -glldb diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/unambiguous_sequence/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/unambiguous_sequence/Makefile index 15bc2e7f415b..41c46c6626b3 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/unambiguous_sequence/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/tail_call_frames/unambiguous_sequence/Makefile @@ -1,4 +1,3 @@ -LEVEL = ../../../make CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules CXXFLAGS += -g -O1 -glldb diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/target-new-solib-notifications/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/target-new-solib-notifications/Makefile index 8a7102e347af..99998b20bcb0 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/target-new-solib-notifications/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/target-new-solib-notifications/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/target_var/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/target_var/Makefile index bb9cc4f2f66d..806c96740af1 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/target_var/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/target_var/Makefile @@ -1,6 +1,4 @@ -LEVEL = ../../make - -include $(LEVEL)/Makefile.rules +include Makefile.rules a.out: globals.ll $(CC) $(CFLAGS) -g -c $^ -o globals.o diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/thread/backtrace_all/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/thread/backtrace_all/Makefile index 24e68012ebd3..78f60047cd78 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/thread/backtrace_all/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/thread/backtrace_all/Makefile @@ -1,6 +1,4 @@ -LEVEL = ../../../make - CXXFLAGS += -std=c++11 CXX_SOURCES := ParallelTask.cpp ENABLE_THREADS := YES -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/thread/backtrace_limit/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/thread/backtrace_limit/Makefile index f0bcf9752de2..1e84d63f106a 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/thread/backtrace_limit/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/thread/backtrace_limit/Makefile @@ -1,6 +1,4 @@ -LEVEL = ../../../make - CXXFLAGS += -std=c++11 CXX_SOURCES := main.cpp ENABLE_THREADS := YES -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/thread/break_after_join/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/thread/break_after_join/Makefile index 67aa16625bff..566938ca0cc4 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/thread/break_after_join/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/thread/break_after_join/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp ENABLE_THREADS := YES -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/thread/concurrent_events/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/thread/concurrent_events/Makefile index 469c0809aa24..c33ae5685efc 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/thread/concurrent_events/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/thread/concurrent_events/Makefile @@ -1,7 +1,5 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp ENABLE_THREADS := YES -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/thread/crash_during_step/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/thread/crash_during_step/Makefile index 26db4816b6ea..3d0b98f13f3d 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/thread/crash_during_step/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/thread/crash_during_step/Makefile @@ -1,4 +1,2 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/thread/create_after_attach/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/thread/create_after_attach/Makefile index 67aa16625bff..566938ca0cc4 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/thread/create_after_attach/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/thread/create_after_attach/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp ENABLE_THREADS := YES -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/thread/create_during_step/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/thread/create_during_step/Makefile index 67aa16625bff..566938ca0cc4 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/thread/create_during_step/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/thread/create_during_step/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp ENABLE_THREADS := YES -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/thread/exit_during_break/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/thread/exit_during_break/Makefile index 67aa16625bff..566938ca0cc4 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/thread/exit_during_break/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/thread/exit_during_break/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp ENABLE_THREADS := YES -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/thread/exit_during_step/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/thread/exit_during_step/Makefile index d06a7d4685f3..ebecfbf92416 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/thread/exit_during_step/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/thread/exit_during_step/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - ENABLE_THREADS := YES CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/thread/jump/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/thread/jump/Makefile index b726fc3695fd..6e962b972091 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/thread/jump/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/thread/jump/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - ENABLE_THREADS := YES CXX_SOURCES := main.cpp other.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/thread/multi_break/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/thread/multi_break/Makefile index 67aa16625bff..566938ca0cc4 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/thread/multi_break/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/thread/multi_break/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp ENABLE_THREADS := YES -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/thread/num_threads/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/thread/num_threads/Makefile index 67aa16625bff..566938ca0cc4 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/thread/num_threads/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/thread/num_threads/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp ENABLE_THREADS := YES -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/thread/state/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/thread/state/Makefile index 26db4816b6ea..3d0b98f13f3d 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/thread/state/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/thread/state/Makefile @@ -1,4 +1,2 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/thread/step_out/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/thread/step_out/Makefile index 035413ff763d..c46619c66234 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/thread/step_out/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/thread/step_out/Makefile @@ -1,6 +1,4 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp ENABLE_THREADS := YES -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/thread/step_until/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/thread/step_until/Makefile index b09a579159d4..10495940055b 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/thread/step_until/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/thread/step_until/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/thread/thread_exit/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/thread/thread_exit/Makefile index d06a7d4685f3..ebecfbf92416 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/thread/thread_exit/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/thread/thread_exit/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - ENABLE_THREADS := YES CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/thread/thread_specific_break/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/thread/thread_specific_break/Makefile index 035413ff763d..c46619c66234 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/thread/thread_specific_break/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/thread/thread_specific_break/Makefile @@ -1,6 +1,4 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp ENABLE_THREADS := YES -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/thread/thread_specific_break_plus_condition/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/thread/thread_specific_break_plus_condition/Makefile index 035413ff763d..c46619c66234 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/thread/thread_specific_break_plus_condition/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/thread/thread_specific_break_plus_condition/Makefile @@ -1,6 +1,4 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp ENABLE_THREADS := YES -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/tsan/basic/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/tsan/basic/Makefile index c930ae563fc1..07133cff3589 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/tsan/basic/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/tsan/basic/Makefile @@ -1,6 +1,4 @@ -LEVEL = ../../../make - C_SOURCES := main.c CFLAGS_EXTRAS := -fsanitize=thread -g -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/tsan/cpp_global_location/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/tsan/cpp_global_location/Makefile index a58194779074..5f671971d593 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/tsan/cpp_global_location/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/tsan/cpp_global_location/Makefile @@ -1,6 +1,4 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp CFLAGS_EXTRAS := -fsanitize=thread -g -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/tsan/global_location/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/tsan/global_location/Makefile index c930ae563fc1..07133cff3589 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/tsan/global_location/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/tsan/global_location/Makefile @@ -1,6 +1,4 @@ -LEVEL = ../../../make - C_SOURCES := main.c CFLAGS_EXTRAS := -fsanitize=thread -g -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/tsan/multiple/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/tsan/multiple/Makefile index c930ae563fc1..07133cff3589 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/tsan/multiple/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/tsan/multiple/Makefile @@ -1,6 +1,4 @@ -LEVEL = ../../../make - C_SOURCES := main.c CFLAGS_EXTRAS := -fsanitize=thread -g -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/tsan/thread_leak/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/tsan/thread_leak/Makefile index c930ae563fc1..07133cff3589 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/tsan/thread_leak/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/tsan/thread_leak/Makefile @@ -1,6 +1,4 @@ -LEVEL = ../../../make - C_SOURCES := main.c CFLAGS_EXTRAS := -fsanitize=thread -g -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/tsan/thread_numbers/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/tsan/thread_numbers/Makefile index c930ae563fc1..07133cff3589 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/tsan/thread_numbers/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/tsan/thread_numbers/Makefile @@ -1,6 +1,4 @@ -LEVEL = ../../../make - C_SOURCES := main.c CFLAGS_EXTRAS := -fsanitize=thread -g -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/tty/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/tty/Makefile index 0d70f2595019..10495940055b 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/tty/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/tty/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/type_completion/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/type_completion/Makefile index 8a7102e347af..99998b20bcb0 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/type_completion/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/type_completion/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/type_lookup/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/type_lookup/Makefile index 7fb4d7a5ab1b..377a1a0373a0 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/type_lookup/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/type_lookup/Makefile @@ -1,9 +1,7 @@ -LEVEL = ../../make - OBJCXX_SOURCES := main.mm CFLAGS_EXTRAS += -w -include $(LEVEL)/Makefile.rules +include Makefile.rules LDFLAGS += -framework Foundation diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/ubsan/basic/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/ubsan/basic/Makefile index 6e7d19b6f48c..b27db90a40de 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/ubsan/basic/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/ubsan/basic/Makefile @@ -1,6 +1,4 @@ -LEVEL = ../../../make - C_SOURCES := main.c CFLAGS_EXTRAS := -fsanitize=undefined -g -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/ubsan/user-expression/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/ubsan/user-expression/Makefile index 6e7d19b6f48c..b27db90a40de 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/ubsan/user-expression/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/ubsan/user-expression/Makefile @@ -1,6 +1,4 @@ -LEVEL = ../../../make - C_SOURCES := main.c CFLAGS_EXTRAS := -fsanitize=undefined -g -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/unwind/ehframe/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/unwind/ehframe/Makefile index 289d25698ffb..493ea3f7f68d 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/unwind/ehframe/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/unwind/ehframe/Makefile @@ -1,7 +1,5 @@ -LEVEL = ../../../make - C_SOURCES := main.c CFLAGS ?= -g -fomit-frame-pointer -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/unwind/noreturn/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/unwind/noreturn/Makefile index ede25f029bcd..36cf5a296e53 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/unwind/noreturn/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/unwind/noreturn/Makefile @@ -1,7 +1,5 @@ -LEVEL = ../../../make - C_SOURCES := main.c CFLAGS ?= -g -Os -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/unwind/sigtramp/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/unwind/sigtramp/Makefile index b09a579159d4..10495940055b 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/unwind/sigtramp/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/unwind/sigtramp/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/unwind/standard/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/unwind/standard/Makefile index 146da30b12cb..22f1051530f8 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/unwind/standard/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/unwind/standard/Makefile @@ -1,3 +1 @@ -LEVEL = ../../../make - -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/value_md5_crash/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/value_md5_crash/Makefile index 8a7102e347af..99998b20bcb0 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/value_md5_crash/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/value_md5_crash/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/var_path/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/var_path/Makefile index 8a7102e347af..99998b20bcb0 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/var_path/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/var_path/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/issue_verification/Makefile b/lldb/packages/Python/lldbsuite/test/issue_verification/Makefile index e7bd3f4dd792..17667ba4366e 100644 --- a/lldb/packages/Python/lldbsuite/test/issue_verification/Makefile +++ b/lldb/packages/Python/lldbsuite/test/issue_verification/Makefile @@ -1,4 +1,3 @@ -LEVEL = ../make CXX_SOURCES := inline_rerun_inferior.cpp CXXFLAGS += -std=c++11 -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/anonymous/Makefile b/lldb/packages/Python/lldbsuite/test/lang/c/anonymous/Makefile index b09a579159d4..10495940055b 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/c/anonymous/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/c/anonymous/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/array_types/Makefile b/lldb/packages/Python/lldbsuite/test/lang/c/array_types/Makefile index b09a579159d4..10495940055b 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/c/array_types/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/c/array_types/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/bitfields/Makefile b/lldb/packages/Python/lldbsuite/test/lang/c/bitfields/Makefile index b09a579159d4..10495940055b 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/c/bitfields/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/c/bitfields/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/blocks/Makefile b/lldb/packages/Python/lldbsuite/test/lang/c/blocks/Makefile index 752b7aed3970..a90dc493b8c3 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/c/blocks/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/c/blocks/Makefile @@ -1,6 +1,4 @@ -LEVEL = ../../../make - C_SOURCES := main.c CFLAGS_EXTRAS += -fblocks -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/conflicting-symbol/Makefile b/lldb/packages/Python/lldbsuite/test/lang/c/conflicting-symbol/Makefile index 979cefe9b7fe..59778ab5d9f1 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/c/conflicting-symbol/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/c/conflicting-symbol/Makefile @@ -1,9 +1,7 @@ -LEVEL := ../../../make - LD_EXTRAS := -L. -LOne -l$(LIB_PREFIX)One -LTwo -l$(LIB_PREFIX)Two C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules .PHONY: a.out: lib_One lib_Two diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/conflicting-symbol/One.mk b/lldb/packages/Python/lldbsuite/test/lang/c/conflicting-symbol/One.mk index 130c7dd511bb..18f3725d22ff 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/c/conflicting-symbol/One.mk +++ b/lldb/packages/Python/lldbsuite/test/lang/c/conflicting-symbol/One.mk @@ -1,10 +1,8 @@ -LEVEL := ../../../make - DYLIB_NAME := One DYLIB_C_SOURCES := One.c OneConstant.c DYLIB_ONLY := YES -include $(LEVEL)/Makefile.rules +include Makefile.rules OneConstant.o: OneConstant.c $(CC) $(CFLAGS_NO_DEBUG) -c $< -o $@ diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/conflicting-symbol/Two.mk b/lldb/packages/Python/lldbsuite/test/lang/c/conflicting-symbol/Two.mk index ebe58cc743fc..79b256a0e858 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/c/conflicting-symbol/Two.mk +++ b/lldb/packages/Python/lldbsuite/test/lang/c/conflicting-symbol/Two.mk @@ -1,10 +1,8 @@ -LEVEL := ../../../make - DYLIB_NAME := Two DYLIB_C_SOURCES := Two.c TwoConstant.c DYLIB_ONLY := YES -include $(LEVEL)/Makefile.rules +include Makefile.rules TwoConstant.o: TwoConstant.c $(CC) $(CFLAGS_NO_DEBUG) -c $< -o $@ diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/const_variables/Makefile b/lldb/packages/Python/lldbsuite/test/lang/c/const_variables/Makefile index 51adad1d0622..47b3ca4be66a 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/c/const_variables/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/c/const_variables/Makefile @@ -1,7 +1,5 @@ -LEVEL = ../../../make - C_SOURCES := main.c functions.c CFLAGS_EXTRAS += -O3 -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/enum_types/Makefile b/lldb/packages/Python/lldbsuite/test/lang/c/enum_types/Makefile index b09a579159d4..10495940055b 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/c/enum_types/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/c/enum_types/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/find_struct_type/Makefile b/lldb/packages/Python/lldbsuite/test/lang/c/find_struct_type/Makefile index cd9ca5c86d84..c9319d6e6888 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/c/find_struct_type/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/c/find_struct_type/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/lang/c/forward/Makefile b/lldb/packages/Python/lldbsuite/test/lang/c/forward/Makefile index 1db43ab479b2..472e733aaadb 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/c/forward/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/c/forward/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - C_SOURCES := main.c foo.c -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/function_types/Makefile b/lldb/packages/Python/lldbsuite/test/lang/c/function_types/Makefile index b09a579159d4..10495940055b 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/c/function_types/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/c/function_types/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/global_variables/Makefile b/lldb/packages/Python/lldbsuite/test/lang/c/global_variables/Makefile index b1b77dacc01e..7b94b6556f25 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/c/global_variables/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/c/global_variables/Makefile @@ -1,8 +1,6 @@ -LEVEL = ../../../make - C_SOURCES := main.c DYLIB_NAME := a DYLIB_C_SOURCES := a.c -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/local_variables/Makefile b/lldb/packages/Python/lldbsuite/test/lang/c/local_variables/Makefile index fd7201886586..ae2e4c45e116 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/c/local_variables/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/c/local_variables/Makefile @@ -1,7 +1,5 @@ -LEVEL = ../../../make - C_SOURCES := main.c CFLAGS_EXTRAS += -O1 -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/modules/Makefile b/lldb/packages/Python/lldbsuite/test/lang/c/modules/Makefile index b09a579159d4..10495940055b 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/c/modules/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/c/modules/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/offsetof/Makefile b/lldb/packages/Python/lldbsuite/test/lang/c/offsetof/Makefile index cd9ca5c86d84..c9319d6e6888 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/c/offsetof/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/c/offsetof/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/lang/c/recurse/Makefile b/lldb/packages/Python/lldbsuite/test/lang/c/recurse/Makefile index b09a579159d4..10495940055b 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/c/recurse/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/c/recurse/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/register_variables/Makefile b/lldb/packages/Python/lldbsuite/test/lang/c/register_variables/Makefile index a98622100ff4..569979a0653c 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/c/register_variables/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/c/register_variables/Makefile @@ -1,7 +1,5 @@ -LEVEL = ../../../make - C_SOURCES := test.c CFLAGS_EXTRAS += -O1 -D_FORTIFY_SOURCE=0 -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/set_values/Makefile b/lldb/packages/Python/lldbsuite/test/lang/c/set_values/Makefile index b09a579159d4..10495940055b 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/c/set_values/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/c/set_values/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/shared_lib/Makefile b/lldb/packages/Python/lldbsuite/test/lang/c/shared_lib/Makefile index 35d712c3f17f..5e26f2748c07 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/c/shared_lib/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/c/shared_lib/Makefile @@ -1,7 +1,5 @@ -LEVEL = ../../../make - DYLIB_NAME := foo DYLIB_C_SOURCES := foo.c C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/shared_lib_stripped_symbols/Makefile b/lldb/packages/Python/lldbsuite/test/lang/c/shared_lib_stripped_symbols/Makefile index 6d1f1071bf2f..f3285de39e0e 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/c/shared_lib_stripped_symbols/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/c/shared_lib_stripped_symbols/Makefile @@ -1,9 +1,7 @@ -LEVEL = ../../../make - DYLIB_NAME := foo DYLIB_C_SOURCES := foo.c C_SOURCES := main.c SPLIT_DEBUG_SYMBOLS = YES -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/step-target/Makefile b/lldb/packages/Python/lldbsuite/test/lang/c/step-target/Makefile index b09a579159d4..10495940055b 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/c/step-target/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/c/step-target/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/stepping/Makefile b/lldb/packages/Python/lldbsuite/test/lang/c/stepping/Makefile index b09a579159d4..10495940055b 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/c/stepping/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/c/stepping/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/strings/Makefile b/lldb/packages/Python/lldbsuite/test/lang/c/strings/Makefile index b09a579159d4..10495940055b 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/c/strings/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/c/strings/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/struct_types/Makefile b/lldb/packages/Python/lldbsuite/test/lang/c/struct_types/Makefile index cd9ca5c86d84..c9319d6e6888 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/c/struct_types/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/c/struct_types/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/lang/c/tls_globals/Makefile b/lldb/packages/Python/lldbsuite/test/lang/c/tls_globals/Makefile index 0faad10b24af..b26ce5c8b144 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/c/tls_globals/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/c/tls_globals/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - C_SOURCES := main.c DYLIB_NAME := a @@ -7,4 +5,4 @@ DYLIB_C_SOURCES := a.c ENABLE_THREADS := YES -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/typedef/Makefile b/lldb/packages/Python/lldbsuite/test/lang/c/typedef/Makefile index b09a579159d4..10495940055b 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/c/typedef/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/c/typedef/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/unicode/Makefile b/lldb/packages/Python/lldbsuite/test/lang/c/unicode/Makefile index efabc4d4335c..db8ac60dd193 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/c/unicode/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/c/unicode/Makefile @@ -1,6 +1,4 @@ -LEVEL = ../../../make - C_SOURCES := main.c CFLAGS_EXTRAS += -finput-charset=UTF-8 -fextended-identifiers -std=c99 -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/unions/Makefile b/lldb/packages/Python/lldbsuite/test/lang/c/unions/Makefile index b09a579159d4..10495940055b 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/c/unions/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/c/unions/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/vla/Makefile b/lldb/packages/Python/lldbsuite/test/lang/c/vla/Makefile index b09a579159d4..10495940055b 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/c/vla/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/c/vla/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/auto/Makefile b/lldb/packages/Python/lldbsuite/test/lang/cpp/auto/Makefile index 314f1cb2f077..99998b20bcb0 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/cpp/auto/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/auto/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/bool/Makefile b/lldb/packages/Python/lldbsuite/test/lang/cpp/bool/Makefile index 314f1cb2f077..99998b20bcb0 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/cpp/bool/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/bool/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/breakpoint-commands/Makefile b/lldb/packages/Python/lldbsuite/test/lang/cpp/breakpoint-commands/Makefile index 1d1f38f7fd0e..6afea39f81c7 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/cpp/breakpoint-commands/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/breakpoint-commands/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := nested.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/breakpoint_in_member_func_w_non_primitive_params/Makefile b/lldb/packages/Python/lldbsuite/test/lang/cpp/breakpoint_in_member_func_w_non_primitive_params/Makefile index 38d1625c615c..dc53622129f6 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/cpp/breakpoint_in_member_func_w_non_primitive_params/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/breakpoint_in_member_func_w_non_primitive_params/Makefile @@ -1,6 +1,4 @@ -LEVEL = ../../../make - CXX_SOURCES = main.cpp a.cpp CFLAGS_EXTRAS = $(MANDATORY_CXXMODULE_BUILD_CFLAGS) -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/call-function/Makefile b/lldb/packages/Python/lldbsuite/test/lang/cpp/call-function/Makefile index 314f1cb2f077..99998b20bcb0 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/cpp/call-function/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/call-function/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/chained-calls/Makefile b/lldb/packages/Python/lldbsuite/test/lang/cpp/chained-calls/Makefile index 314f1cb2f077..99998b20bcb0 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/cpp/chained-calls/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/chained-calls/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/char1632_t/Makefile b/lldb/packages/Python/lldbsuite/test/lang/cpp/char1632_t/Makefile index 932046f26968..64fd6effcee4 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/cpp/char1632_t/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/char1632_t/Makefile @@ -1,8 +1,6 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp CFLAGS :=-g -O0 -std=c++11 clean: OBJECTS+=$(wildcard main.d.*) -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/char8_t/Makefile b/lldb/packages/Python/lldbsuite/test/lang/cpp/char8_t/Makefile index 444da5fae9c1..c69bf503a34a 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/cpp/char8_t/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/char8_t/Makefile @@ -1,6 +1,4 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp CFLAGS_EXTRAS := -std=c++2a -fchar8_t -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/class-template-parameter-pack/Makefile b/lldb/packages/Python/lldbsuite/test/lang/cpp/class-template-parameter-pack/Makefile index 99bfa7e03b47..3d0b98f13f3d 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/cpp/class-template-parameter-pack/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/class-template-parameter-pack/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/lang/cpp/class_static/Makefile b/lldb/packages/Python/lldbsuite/test/lang/cpp/class_static/Makefile index 314f1cb2f077..99998b20bcb0 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/cpp/class_static/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/class_static/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/class_types/Makefile b/lldb/packages/Python/lldbsuite/test/lang/cpp/class_types/Makefile index 314f1cb2f077..99998b20bcb0 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/cpp/class_types/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/class_types/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/const_this/Makefile b/lldb/packages/Python/lldbsuite/test/lang/cpp/const_this/Makefile index 52a92c0b61ae..b5d2d900f90c 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/cpp/const_this/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/const_this/Makefile @@ -1,7 +1,6 @@ -LEVEL = ../../../make CXX_SOURCES := main.cpp CXXFLAGS += -std=c++11 -include $(LEVEL)/Makefile.rules +include Makefile.rules cleanup: rm -f Makefile *.d diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/diamond/Makefile b/lldb/packages/Python/lldbsuite/test/lang/cpp/diamond/Makefile index 314f1cb2f077..99998b20bcb0 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/cpp/diamond/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/diamond/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/dynamic-value-same-basename/Makefile b/lldb/packages/Python/lldbsuite/test/lang/cpp/dynamic-value-same-basename/Makefile index 314f1cb2f077..99998b20bcb0 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/cpp/dynamic-value-same-basename/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/dynamic-value-same-basename/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/dynamic-value/Makefile b/lldb/packages/Python/lldbsuite/test/lang/cpp/dynamic-value/Makefile index 8770b2343ef0..2bba8e757f79 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/cpp/dynamic-value/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/dynamic-value/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := pass-to-base.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/enum_types/Makefile b/lldb/packages/Python/lldbsuite/test/lang/cpp/enum_types/Makefile index 0e0f5d1dad3d..ac4b37c7c7bf 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/cpp/enum_types/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/enum_types/Makefile @@ -1,10 +1,8 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp CXXFLAGS += -std=c++11 clean: OBJECTS+=$(wildcard main.d.*) -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/exceptions/Makefile b/lldb/packages/Python/lldbsuite/test/lang/cpp/exceptions/Makefile index a6bd8463ad54..edb53da7b8e5 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/cpp/exceptions/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/exceptions/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := exceptions.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/extern_c/Makefile b/lldb/packages/Python/lldbsuite/test/lang/cpp/extern_c/Makefile index 99bfa7e03b47..3d0b98f13f3d 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/cpp/extern_c/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/extern_c/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/lang/cpp/frame-var-anon-unions/Makefile b/lldb/packages/Python/lldbsuite/test/lang/cpp/frame-var-anon-unions/Makefile index 314f1cb2f077..99998b20bcb0 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/cpp/frame-var-anon-unions/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/frame-var-anon-unions/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/function-template-parameter-pack/Makefile b/lldb/packages/Python/lldbsuite/test/lang/cpp/function-template-parameter-pack/Makefile index 99bfa7e03b47..3d0b98f13f3d 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/cpp/function-template-parameter-pack/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/function-template-parameter-pack/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/lang/cpp/function_refs/Makefile b/lldb/packages/Python/lldbsuite/test/lang/cpp/function_refs/Makefile index 99bfa7e03b47..3d0b98f13f3d 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/cpp/function_refs/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/function_refs/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/lang/cpp/global_operators/Makefile b/lldb/packages/Python/lldbsuite/test/lang/cpp/global_operators/Makefile index 314f1cb2f077..99998b20bcb0 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/cpp/global_operators/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/global_operators/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/global_variables/Makefile b/lldb/packages/Python/lldbsuite/test/lang/cpp/global_variables/Makefile index 314f1cb2f077..99998b20bcb0 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/cpp/global_variables/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/global_variables/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/gmodules-templates/Makefile b/lldb/packages/Python/lldbsuite/test/lang/cpp/gmodules-templates/Makefile index 0497d78fec3c..9826dd4af44f 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/cpp/gmodules-templates/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/gmodules-templates/Makefile @@ -1,6 +1,4 @@ -LEVEL = ../../../make - CXX_SOURCES = main.cpp # CFLAGS_EXTRAS += $(MODULE_DEBUG_INFO_FLAGS) -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/gmodules/Makefile b/lldb/packages/Python/lldbsuite/test/lang/cpp/gmodules/Makefile index da6f39a7488c..4a430eccc701 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/cpp/gmodules/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/gmodules/Makefile @@ -1,7 +1,5 @@ -LEVEL = ../../../make - PCH_CXX_SOURCE = pch.h CXX_SOURCES = main.cpp CFLAGS_EXTRAS += $(MODULE_DEBUG_INFO_FLAGS) -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/incomplete-types/Makefile b/lldb/packages/Python/lldbsuite/test/lang/cpp/incomplete-types/Makefile index 2ce96e90d2d8..769920c28336 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/cpp/incomplete-types/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/incomplete-types/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES = main.cpp length.cpp a.cpp CFLAGS_LIMIT = -c $(CXXFLAGS) @@ -32,4 +30,4 @@ a.o: a.cpp clean: OBJECTS += limit nolimit length_limit.o length_nolimit.o length_limit.dwo length_nolimit.dwo -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/inlines/Makefile b/lldb/packages/Python/lldbsuite/test/lang/cpp/inlines/Makefile index 8f67abdf2b34..055e318e2208 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/cpp/inlines/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/inlines/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := inlines.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/limit-debug-info/Makefile b/lldb/packages/Python/lldbsuite/test/lang/cpp/limit-debug-info/Makefile index b9a3d3fe1c81..8e811fdeb67a 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/cpp/limit-debug-info/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/limit-debug-info/Makefile @@ -1,7 +1,5 @@ -LEVEL = ../../../make - CXX_SOURCES = main.cpp derived.cpp base.cpp CFLAGS_EXTRAS += $(LIMIT_DEBUG_INFO_FLAGS) -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/llvm-style/Makefile b/lldb/packages/Python/lldbsuite/test/lang/cpp/llvm-style/Makefile index aae93a20b9c8..f78d6a76780d 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/cpp/llvm-style/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/llvm-style/Makefile @@ -1,3 +1,2 @@ -LEVEL = ../../../make CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules \ No newline at end of file +include Makefile.rules \ No newline at end of file diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/member-and-local-vars-with-same-name/Makefile b/lldb/packages/Python/lldbsuite/test/lang/cpp/member-and-local-vars-with-same-name/Makefile index 35eb63f922f7..82f96b62609f 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/cpp/member-and-local-vars-with-same-name/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/member-and-local-vars-with-same-name/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES = main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/modules-import/Makefile b/lldb/packages/Python/lldbsuite/test/lang/cpp/modules-import/Makefile index 2b8f23bcec77..9e7837a76953 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/cpp/modules-import/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/modules-import/Makefile @@ -1,5 +1,4 @@ -LEVEL = ../../../make CXX_SOURCES := main.cpp CFLAGS_EXTRAS = $(MANDATORY_MODULE_BUILD_CFLAGS) -I$(BUILDDIR)/include -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/namespace/Makefile b/lldb/packages/Python/lldbsuite/test/lang/cpp/namespace/Makefile index 7dd5eb4c11f1..638974fafd6d 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/cpp/namespace/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/namespace/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp ns.cpp ns2.cpp ns3.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/namespace_conflicts/Makefile b/lldb/packages/Python/lldbsuite/test/lang/cpp/namespace_conflicts/Makefile index 99bfa7e03b47..3d0b98f13f3d 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/cpp/namespace_conflicts/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/namespace_conflicts/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/lang/cpp/namespace_definitions/Makefile b/lldb/packages/Python/lldbsuite/test/lang/cpp/namespace_definitions/Makefile index 9e52bacd5fc9..a8ed4b5ecf17 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/cpp/namespace_definitions/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/namespace_definitions/Makefile @@ -1,9 +1,7 @@ -LEVEL := ../../../make - LD_EXTRAS := -L. -l$(LIB_PREFIX)a -l$(LIB_PREFIX)b CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules .PHONY: a.out: lib_a lib_b diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/namespace_definitions/a.mk b/lldb/packages/Python/lldbsuite/test/lang/cpp/namespace_definitions/a.mk index e53570873a3a..b214267c0624 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/cpp/namespace_definitions/a.mk +++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/namespace_definitions/a.mk @@ -1,7 +1,5 @@ -LEVEL := ../../../make - DYLIB_NAME := a DYLIB_CXX_SOURCES := a.cpp DYLIB_ONLY := YES -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/namespace_definitions/b.mk b/lldb/packages/Python/lldbsuite/test/lang/cpp/namespace_definitions/b.mk index 54a1d8dea5a6..7fc442d2ae0a 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/cpp/namespace_definitions/b.mk +++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/namespace_definitions/b.mk @@ -1,7 +1,5 @@ -LEVEL := ../../../make - DYLIB_NAME := b DYLIB_CXX_SOURCES := b.cpp DYLIB_ONLY := YES -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/nsimport/Makefile b/lldb/packages/Python/lldbsuite/test/lang/cpp/nsimport/Makefile index 314f1cb2f077..99998b20bcb0 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/cpp/nsimport/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/nsimport/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/offsetof/Makefile b/lldb/packages/Python/lldbsuite/test/lang/cpp/offsetof/Makefile index 99bfa7e03b47..3d0b98f13f3d 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/cpp/offsetof/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/offsetof/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/lang/cpp/operator-overload/Makefile b/lldb/packages/Python/lldbsuite/test/lang/cpp/operator-overload/Makefile index bd8116b91c3c..80b3ee02c3e9 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/cpp/operator-overload/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/operator-overload/Makefile @@ -1,8 +1,6 @@ -LEVEL = ../../../make - CXX_SOURCES = a.cpp b.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules a.o: a.cpp $(CC) $(CFLAGS_NO_DEBUG) -c $< -o $@ diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/operators/Makefile b/lldb/packages/Python/lldbsuite/test/lang/cpp/operators/Makefile index 99bfa7e03b47..3d0b98f13f3d 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/cpp/operators/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/operators/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/lang/cpp/overloaded-functions/Makefile b/lldb/packages/Python/lldbsuite/test/lang/cpp/overloaded-functions/Makefile index a8d5c4eb0268..1185ed0c1e89 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/cpp/overloaded-functions/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/overloaded-functions/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp static-a.cpp static-b.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/rvalue-references/Makefile b/lldb/packages/Python/lldbsuite/test/lang/cpp/rvalue-references/Makefile index 3a1d8a579350..57ee6052ae9c 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/cpp/rvalue-references/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/rvalue-references/Makefile @@ -1,7 +1,5 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp CXXFLAGS += -std=c++11 -include $(LEVEL)/Makefile.rules \ No newline at end of file +include Makefile.rules \ No newline at end of file diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/scope/Makefile b/lldb/packages/Python/lldbsuite/test/lang/cpp/scope/Makefile index 314f1cb2f077..99998b20bcb0 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/cpp/scope/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/scope/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/signed_types/Makefile b/lldb/packages/Python/lldbsuite/test/lang/cpp/signed_types/Makefile index 314f1cb2f077..99998b20bcb0 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/cpp/signed_types/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/signed_types/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/static_members/Makefile b/lldb/packages/Python/lldbsuite/test/lang/cpp/static_members/Makefile index 314f1cb2f077..99998b20bcb0 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/cpp/static_members/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/static_members/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/static_methods/Makefile b/lldb/packages/Python/lldbsuite/test/lang/cpp/static_methods/Makefile index 314f1cb2f077..99998b20bcb0 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/cpp/static_methods/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/static_methods/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/std-function-step-into-callable/Makefile b/lldb/packages/Python/lldbsuite/test/lang/cpp/std-function-step-into-callable/Makefile index a42bb089d15a..f96dd95399ee 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/cpp/std-function-step-into-callable/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/std-function-step-into-callable/Makefile @@ -1,7 +1,5 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp CXXFLAGS += -std=c++11 USE_LIBCPP := 1 -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/stl/Makefile b/lldb/packages/Python/lldbsuite/test/lang/cpp/stl/Makefile index fe27980afe9b..a4b03ae0aab2 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/cpp/stl/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/stl/Makefile @@ -1,8 +1,6 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp CFLAGS := -g -O0 clean: OBJECTS+=$(wildcard main.d.*) -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/symbols/Makefile b/lldb/packages/Python/lldbsuite/test/lang/cpp/symbols/Makefile index 99bfa7e03b47..3d0b98f13f3d 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/cpp/symbols/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/symbols/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/lang/cpp/template-function/Makefile b/lldb/packages/Python/lldbsuite/test/lang/cpp/template-function/Makefile index 314f1cb2f077..99998b20bcb0 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/cpp/template-function/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/template-function/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/template/Makefile b/lldb/packages/Python/lldbsuite/test/lang/cpp/template/Makefile index 314f1cb2f077..99998b20bcb0 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/cpp/template/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/template/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/this/Makefile b/lldb/packages/Python/lldbsuite/test/lang/cpp/this/Makefile index 314f1cb2f077..99998b20bcb0 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/cpp/this/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/this/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/trivial_abi/Makefile b/lldb/packages/Python/lldbsuite/test/lang/cpp/trivial_abi/Makefile index 314f1cb2f077..99998b20bcb0 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/cpp/trivial_abi/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/trivial_abi/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/type_lookup/Makefile b/lldb/packages/Python/lldbsuite/test/lang/cpp/type_lookup/Makefile index 99bfa7e03b47..3d0b98f13f3d 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/cpp/type_lookup/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/type_lookup/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/lang/cpp/unicode-literals/Makefile b/lldb/packages/Python/lldbsuite/test/lang/cpp/unicode-literals/Makefile index 1476447db355..bf443d855cef 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/cpp/unicode-literals/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/unicode-literals/Makefile @@ -1,8 +1,6 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp CFLAGS := -g -O0 -std=c++11 clean: OBJECTS+=$(wildcard main.d.*) -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/unique-types/Makefile b/lldb/packages/Python/lldbsuite/test/lang/cpp/unique-types/Makefile index 314f1cb2f077..99998b20bcb0 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/cpp/unique-types/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/unique-types/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/unsigned_types/Makefile b/lldb/packages/Python/lldbsuite/test/lang/cpp/unsigned_types/Makefile index 314f1cb2f077..99998b20bcb0 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/cpp/unsigned_types/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/unsigned_types/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/virtual-overload/Makefile b/lldb/packages/Python/lldbsuite/test/lang/cpp/virtual-overload/Makefile index 314f1cb2f077..99998b20bcb0 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/cpp/virtual-overload/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/virtual-overload/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/virtual/Makefile b/lldb/packages/Python/lldbsuite/test/lang/cpp/virtual/Makefile index 314f1cb2f077..99998b20bcb0 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/cpp/virtual/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/virtual/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/wchar_t/Makefile b/lldb/packages/Python/lldbsuite/test/lang/cpp/wchar_t/Makefile index fe27980afe9b..a4b03ae0aab2 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/cpp/wchar_t/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/wchar_t/Makefile @@ -1,8 +1,6 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp CFLAGS := -g -O0 clean: OBJECTS+=$(wildcard main.d.*) -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/mixed/Makefile b/lldb/packages/Python/lldbsuite/test/lang/mixed/Makefile index 860343ee907c..12db32c506f5 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/mixed/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/mixed/Makefile @@ -1,6 +1,4 @@ -LEVEL = ../../make - CXX_SOURCES := foo.cpp C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/blocks/Makefile b/lldb/packages/Python/lldbsuite/test/lang/objc/blocks/Makefile index 0af83591826f..48c06c712cdb 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/objc/blocks/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/objc/blocks/Makefile @@ -1,6 +1,4 @@ -LEVEL = ../../../make - OBJC_SOURCES := ivars-in-blocks.m main.m LDFLAGS = $(CFLAGS) -lobjc -framework Foundation -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/conflicting-definition/Makefile b/lldb/packages/Python/lldbsuite/test/lang/objc/conflicting-definition/Makefile index 346fc4b1fbc5..e079ba94e382 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/objc/conflicting-definition/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/objc/conflicting-definition/Makefile @@ -1,8 +1,6 @@ -LEVEL = ../../../make - LD_EXTRAS = -lobjc -framework Foundation -include $(LEVEL)/Makefile.rules +include Makefile.rules all: a.out diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/conflicting-definition/Test/Test.mk b/lldb/packages/Python/lldbsuite/test/lang/objc/conflicting-definition/Test/Test.mk index be758ac07d85..7c36e32ac9d4 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/objc/conflicting-definition/Test/Test.mk +++ b/lldb/packages/Python/lldbsuite/test/lang/objc/conflicting-definition/Test/Test.mk @@ -1,5 +1,3 @@ -LEVEL = ../../../make - DYLIB_NAME := Test DYLIB_ONLY := YES CFLAGS_EXTRAS = -I$(SRCDIR)/.. @@ -7,4 +5,4 @@ LD_EXTRAS = -lobjc -framework Foundation DYLIB_OBJC_SOURCES = Test/Test.m -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/conflicting-definition/TestExt/TestExt.mk b/lldb/packages/Python/lldbsuite/test/lang/objc/conflicting-definition/TestExt/TestExt.mk index 285d7262ce82..5455a856e502 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/objc/conflicting-definition/TestExt/TestExt.mk +++ b/lldb/packages/Python/lldbsuite/test/lang/objc/conflicting-definition/TestExt/TestExt.mk @@ -1,5 +1,3 @@ -LEVEL = ../../../make - DYLIB_NAME := TestExt DYLIB_ONLY := YES CFLAGS_EXTRAS = -I$(SRCDIR)/.. @@ -7,4 +5,4 @@ LD_EXTRAS = -L. -lTest -lobjc -framework Foundation DYLIB_OBJC_SOURCES = TestExt/TestExt.m -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/exceptions/Makefile b/lldb/packages/Python/lldbsuite/test/lang/objc/exceptions/Makefile index 261658b10ae8..377a1a0373a0 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/objc/exceptions/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/objc/exceptions/Makefile @@ -1,9 +1,7 @@ -LEVEL = ../../../make - OBJCXX_SOURCES := main.mm CFLAGS_EXTRAS += -w -include $(LEVEL)/Makefile.rules +include Makefile.rules LDFLAGS += -framework Foundation diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/forward-decl/Makefile b/lldb/packages/Python/lldbsuite/test/lang/objc/forward-decl/Makefile index b99925b50b38..b9d3a985fbe9 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/objc/forward-decl/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/objc/forward-decl/Makefile @@ -1,9 +1,7 @@ -LEVEL = ../../../make - DYLIB_NAME := Container DYLIB_OBJC_SOURCES := Container.m OBJC_SOURCES := main.m -include $(LEVEL)/Makefile.rules +include Makefile.rules LDFLAGS += -framework Foundation diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/foundation/Makefile b/lldb/packages/Python/lldbsuite/test/lang/objc/foundation/Makefile index ce2ccd28321d..38ef76b8d585 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/objc/foundation/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/objc/foundation/Makefile @@ -1,8 +1,6 @@ -LEVEL = ../../../make - OBJC_SOURCES := main.m my-base.m #OBJC_SOURCES := const-strings.m -include $(LEVEL)/Makefile.rules +include Makefile.rules LDFLAGS += -framework Foundation diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/global_ptrs/Makefile b/lldb/packages/Python/lldbsuite/test/lang/objc/global_ptrs/Makefile index a1608fe5a664..32d01e345df6 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/objc/global_ptrs/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/objc/global_ptrs/Makefile @@ -1,6 +1,4 @@ -LEVEL = ../../../make - OBJC_SOURCES := main.m LDFLAGS = $(CFLAGS) -lobjc -framework Foundation -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/hidden-ivars/Makefile b/lldb/packages/Python/lldbsuite/test/lang/objc/hidden-ivars/Makefile index 1768d11ca279..0664769456ef 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/objc/hidden-ivars/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/objc/hidden-ivars/Makefile @@ -1,9 +1,7 @@ -LEVEL = ../../../make - DYLIB_NAME := InternalDefiner DYLIB_OBJC_SOURCES := InternalDefiner.m OBJC_SOURCES := main.m LD_EXTRAS = -framework Foundation -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/ivar-IMP/Makefile b/lldb/packages/Python/lldbsuite/test/lang/objc/ivar-IMP/Makefile index f69da9a64be0..843400a08cfc 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/objc/ivar-IMP/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/objc/ivar-IMP/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CC ?= clang ifeq "$(ARCH)" "" ARCH = x86_64 @@ -25,4 +23,4 @@ aout: clean:: rm -f myclass.o -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/modules-auto-import/Makefile b/lldb/packages/Python/lldbsuite/test/lang/objc/modules-auto-import/Makefile index ca099e1e9611..c6bd24d99ada 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/objc/modules-auto-import/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/objc/modules-auto-import/Makefile @@ -1,6 +1,5 @@ -LEVEL = ../../../make OBJC_SOURCES := main.m CFLAGS += $(MANDATORY_MODULE_BUILD_CFLAGS) -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/modules-cache/Makefile b/lldb/packages/Python/lldbsuite/test/lang/objc/modules-cache/Makefile index 00cb9b6be34a..d0aadc1af9e5 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/objc/modules-cache/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/objc/modules-cache/Makefile @@ -1,3 +1,2 @@ -LEVEL = ../../../make OBJC_SOURCES := main.m -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/modules-incomplete/Makefile b/lldb/packages/Python/lldbsuite/test/lang/objc/modules-incomplete/Makefile index b8462bc818ca..c32d0fb655d0 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/objc/modules-incomplete/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/objc/modules-incomplete/Makefile @@ -1,8 +1,6 @@ -LEVEL = ../../../make - OBJC_SOURCES := main.m myModule.m -include $(LEVEL)/Makefile.rules +include Makefile.rules CFLAGS += $(MANDATORY_MODULE_BUILD_CFLAGS) LDFLAGS += -framework Foundation diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/modules-inline-functions/Makefile b/lldb/packages/Python/lldbsuite/test/lang/objc/modules-inline-functions/Makefile index 320e13ed5c5f..78d1c67dec16 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/objc/modules-inline-functions/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/objc/modules-inline-functions/Makefile @@ -1,9 +1,7 @@ -LEVEL = ../../../make - C_SOURCES := myModule.c OBJC_SOURCES := main.m -include $(LEVEL)/Makefile.rules +include Makefile.rules CFLAGS += $(MANDATORY_MODULE_BUILD_CFLAGS) -I$(PWD) diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/modules/Makefile b/lldb/packages/Python/lldbsuite/test/lang/objc/modules/Makefile index ad3cb3fadcde..7202932571dc 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/objc/modules/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/objc/modules/Makefile @@ -1,7 +1,5 @@ -LEVEL = ../../../make - OBJC_SOURCES := main.m -include $(LEVEL)/Makefile.rules +include Makefile.rules LDFLAGS += -framework Foundation diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/objc++/Makefile b/lldb/packages/Python/lldbsuite/test/lang/objc/objc++/Makefile index 910d4943ef05..e8a4b0cc29c7 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/objc/objc++/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/objc/objc++/Makefile @@ -1,6 +1,4 @@ -LEVEL = ../../../make - OBJCXX_SOURCES := main.mm LD_EXTRAS = -framework Foundation -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-baseclass-sbtype/Makefile b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-baseclass-sbtype/Makefile index 7f7baeb3cf1c..ad28ecfeb5d1 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-baseclass-sbtype/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-baseclass-sbtype/Makefile @@ -1,6 +1,4 @@ -LEVEL = ../../../make - OBJC_SOURCES := main.m LD_EXTRAS = -lobjc -framework Foundation -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-builtin-types/Makefile b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-builtin-types/Makefile index 314f1cb2f077..99998b20bcb0 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-builtin-types/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-builtin-types/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-checker/Makefile b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-checker/Makefile index a1608fe5a664..32d01e345df6 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-checker/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-checker/Makefile @@ -1,6 +1,4 @@ -LEVEL = ../../../make - OBJC_SOURCES := main.m LDFLAGS = $(CFLAGS) -lobjc -framework Foundation -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-class-method/Makefile b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-class-method/Makefile index c2d07910a6e8..e0c4678f5d90 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-class-method/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-class-method/Makefile @@ -1,6 +1,4 @@ -LEVEL = ../../../make - OBJC_SOURCES := class.m LDFLAGS = $(CFLAGS) -lobjc -framework Foundation -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-dyn-sbtype/Makefile b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-dyn-sbtype/Makefile index dd909afba21b..9ff3ce6e4a55 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-dyn-sbtype/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-dyn-sbtype/Makefile @@ -1,7 +1,5 @@ -LEVEL = ../../../make - OBJC_SOURCES := main.m -include $(LEVEL)/Makefile.rules +include Makefile.rules LD_EXTRAS = -framework Foundation diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-dynamic-value/Makefile b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-dynamic-value/Makefile index a981f4b9035e..8677e2265568 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-dynamic-value/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-dynamic-value/Makefile @@ -1,6 +1,4 @@ -LEVEL = ../../../make - OBJC_SOURCES := dynamic-value.m LDFLAGS = $(CFLAGS) -lobjc -framework Foundation -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-ivar-offsets/Makefile b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-ivar-offsets/Makefile index fdd3b5ebfa9e..701fd53ab273 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-ivar-offsets/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-ivar-offsets/Makefile @@ -1,6 +1,4 @@ -LEVEL = ../../../make - OBJC_SOURCES := objc-ivar-offsets.m main.m LDFLAGS = $(CFLAGS) -lobjc -framework Foundation -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-ivar-stripped/Makefile b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-ivar-stripped/Makefile index b93a8a13379d..32c0f4aef408 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-ivar-stripped/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-ivar-stripped/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - OBJC_SOURCES := main.m LDFLAGS = $(CFLAGS) -lobjc -framework Foundation @@ -12,4 +10,4 @@ clean:: rm -f a.out.stripped rm -rf a.out.stripped.dSYM -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-new-syntax/Makefile b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-new-syntax/Makefile index ad3cb3fadcde..7202932571dc 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-new-syntax/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-new-syntax/Makefile @@ -1,7 +1,5 @@ -LEVEL = ../../../make - OBJC_SOURCES := main.m -include $(LEVEL)/Makefile.rules +include Makefile.rules LDFLAGS += -framework Foundation diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-optimized/Makefile b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-optimized/Makefile index aa6a7520525e..9be48503826a 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-optimized/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-optimized/Makefile @@ -1,8 +1,6 @@ -LEVEL = ../../../make - OBJC_SOURCES := main.m CFLAGS ?= -arch $(ARCH) -g -O2 LDFLAGS = $(CFLAGS) -lobjc -framework Foundation -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-property/Makefile b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-property/Makefile index a1608fe5a664..32d01e345df6 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-property/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-property/Makefile @@ -1,6 +1,4 @@ -LEVEL = ../../../make - OBJC_SOURCES := main.m LDFLAGS = $(CFLAGS) -lobjc -framework Foundation -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-runtime-ivars/Makefile b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-runtime-ivars/Makefile index a1608fe5a664..32d01e345df6 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-runtime-ivars/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-runtime-ivars/Makefile @@ -1,6 +1,4 @@ -LEVEL = ../../../make - OBJC_SOURCES := main.m LDFLAGS = $(CFLAGS) -lobjc -framework Foundation -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-static-method-stripped/Makefile b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-static-method-stripped/Makefile index 6c5492dade11..5ba751c1567e 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-static-method-stripped/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-static-method-stripped/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - OBJC_SOURCES := static.m LDFLAGS = $(CFLAGS) -lobjc -framework Foundation @@ -13,4 +11,4 @@ clean:: rm -f a.out.stripped rm -rf $(wildcard *.dSYM) -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-static-method/Makefile b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-static-method/Makefile index a8e973f6d3b1..1c9e629925f8 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-static-method/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-static-method/Makefile @@ -1,6 +1,4 @@ -LEVEL = ../../../make - OBJC_SOURCES := static.m LDFLAGS = $(CFLAGS) -lobjc -framework Foundation -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-stepping/Makefile b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-stepping/Makefile index b097fe65fce7..09e6a5ea3387 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-stepping/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-stepping/Makefile @@ -1,6 +1,4 @@ -LEVEL = ../../../make - OBJC_SOURCES := stepping-tests.m LDFLAGS = $(CFLAGS) -lobjc -framework Foundation -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-struct-argument/Makefile b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-struct-argument/Makefile index c16802966cff..1db77a61ecdd 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-struct-argument/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-struct-argument/Makefile @@ -1,6 +1,4 @@ -LEVEL = ../../../make - OBJC_SOURCES := test.m LDFLAGS = $(CFLAGS) -lobjc -framework Foundation -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-struct-return/Makefile b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-struct-return/Makefile index c16802966cff..1db77a61ecdd 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-struct-return/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-struct-return/Makefile @@ -1,6 +1,4 @@ -LEVEL = ../../../make - OBJC_SOURCES := test.m LDFLAGS = $(CFLAGS) -lobjc -framework Foundation -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-super/Makefile b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-super/Makefile index c2d07910a6e8..e0c4678f5d90 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-super/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-super/Makefile @@ -1,6 +1,4 @@ -LEVEL = ../../../make - OBJC_SOURCES := class.m LDFLAGS = $(CFLAGS) -lobjc -framework Foundation -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/orderedset/Makefile b/lldb/packages/Python/lldbsuite/test/lang/objc/orderedset/Makefile index a1608fe5a664..32d01e345df6 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/objc/orderedset/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/objc/orderedset/Makefile @@ -1,6 +1,4 @@ -LEVEL = ../../../make - OBJC_SOURCES := main.m LDFLAGS = $(CFLAGS) -lobjc -framework Foundation -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/print-obj/Makefile b/lldb/packages/Python/lldbsuite/test/lang/objc/print-obj/Makefile index dba1065cd714..1d34d4ed2fff 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/objc/print-obj/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/objc/print-obj/Makefile @@ -1,6 +1,4 @@ -LEVEL = ../../../make - OBJC_SOURCES := blocked.m LDFLAGS = $(CFLAGS) -lobjc -framework Foundation -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/ptr_refs/Makefile b/lldb/packages/Python/lldbsuite/test/lang/objc/ptr_refs/Makefile index b05ff34b739b..845553d5e3f2 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/objc/ptr_refs/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/objc/ptr_refs/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - OBJC_SOURCES := main.m -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/radar-9691614/Makefile b/lldb/packages/Python/lldbsuite/test/lang/objc/radar-9691614/Makefile index ad3cb3fadcde..7202932571dc 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/objc/radar-9691614/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/objc/radar-9691614/Makefile @@ -1,7 +1,5 @@ -LEVEL = ../../../make - OBJC_SOURCES := main.m -include $(LEVEL)/Makefile.rules +include Makefile.rules LDFLAGS += -framework Foundation diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/rdar-10967107/Makefile b/lldb/packages/Python/lldbsuite/test/lang/objc/rdar-10967107/Makefile index ad3cb3fadcde..7202932571dc 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/objc/rdar-10967107/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/objc/rdar-10967107/Makefile @@ -1,7 +1,5 @@ -LEVEL = ../../../make - OBJC_SOURCES := main.m -include $(LEVEL)/Makefile.rules +include Makefile.rules LDFLAGS += -framework Foundation diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/rdar-11355592/Makefile b/lldb/packages/Python/lldbsuite/test/lang/objc/rdar-11355592/Makefile index ad3cb3fadcde..7202932571dc 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/objc/rdar-11355592/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/objc/rdar-11355592/Makefile @@ -1,7 +1,5 @@ -LEVEL = ../../../make - OBJC_SOURCES := main.m -include $(LEVEL)/Makefile.rules +include Makefile.rules LDFLAGS += -framework Foundation diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/rdar-12408181/Makefile b/lldb/packages/Python/lldbsuite/test/lang/objc/rdar-12408181/Makefile index 385b557c9af0..919000e6402f 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/objc/rdar-12408181/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/objc/rdar-12408181/Makefile @@ -1,8 +1,6 @@ -LEVEL = ../../../make - OBJC_SOURCES := main.m -include $(LEVEL)/Makefile.rules +include Makefile.rules ifneq (,$(findstring arm,$(ARCH))) LD_EXTRAS = -framework Foundation -framework UIKit diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/real-definition/Makefile b/lldb/packages/Python/lldbsuite/test/lang/objc/real-definition/Makefile index 61cc3b3b6db8..1b3732be2528 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/objc/real-definition/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/objc/real-definition/Makefile @@ -1,6 +1,4 @@ -LEVEL = ../../../make - OBJC_SOURCES := Bar.m Foo.m main.m LDFLAGS = $(CFLAGS) -lobjc -framework Foundation -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/sample/Makefile b/lldb/packages/Python/lldbsuite/test/lang/objc/sample/Makefile index a1608fe5a664..32d01e345df6 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/objc/sample/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/objc/sample/Makefile @@ -1,6 +1,4 @@ -LEVEL = ../../../make - OBJC_SOURCES := main.m LDFLAGS = $(CFLAGS) -lobjc -framework Foundation -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/self/Makefile b/lldb/packages/Python/lldbsuite/test/lang/objc/self/Makefile index bdae30428be4..644046c69eac 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/objc/self/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/objc/self/Makefile @@ -1,6 +1,4 @@ -LEVEL = ../../../make - OBJC_SOURCES := main.m LD_EXTRAS ?= -framework Foundation -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/single-entry-dictionary/Makefile b/lldb/packages/Python/lldbsuite/test/lang/objc/single-entry-dictionary/Makefile index ad3cb3fadcde..7202932571dc 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/objc/single-entry-dictionary/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/objc/single-entry-dictionary/Makefile @@ -1,7 +1,5 @@ -LEVEL = ../../../make - OBJC_SOURCES := main.m -include $(LEVEL)/Makefile.rules +include Makefile.rules LDFLAGS += -framework Foundation diff --git a/lldb/packages/Python/lldbsuite/test/lang/objcxx/class-name-clash/Makefile b/lldb/packages/Python/lldbsuite/test/lang/objcxx/class-name-clash/Makefile index 57da077c8620..bae88debbb1b 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/objcxx/class-name-clash/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/objcxx/class-name-clash/Makefile @@ -1,6 +1,5 @@ -LEVEL = ../../../make OBJCXX_SOURCES := main.mm myobject.mm -include $(LEVEL)/Makefile.rules +include Makefile.rules CFLAGS_NO_DEBUG = ifeq "$(OS)" "Darwin" CFLAGS_NO_DEBUG += -arch $(ARCH) diff --git a/lldb/packages/Python/lldbsuite/test/lang/objcxx/cxx-bridged-po/Makefile b/lldb/packages/Python/lldbsuite/test/lang/objcxx/cxx-bridged-po/Makefile index c258c4de49ec..7423b54218a5 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/objcxx/cxx-bridged-po/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/objcxx/cxx-bridged-po/Makefile @@ -1,6 +1,4 @@ -LEVEL = ../../../make - OBJCXX_SOURCES := main.mm LDFLAGS = $(CFLAGS) -lobjc -framework CoreFoundation -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/objcxx/hide-runtime-values/Makefile b/lldb/packages/Python/lldbsuite/test/lang/objcxx/hide-runtime-values/Makefile index edd3430de7c8..c0b4b1a3470a 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/objcxx/hide-runtime-values/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/objcxx/hide-runtime-values/Makefile @@ -1,6 +1,4 @@ -LEVEL = ../../../make - OBJCXX_SOURCES := main.mm LDFLAGS = $(CFLAGS) -lobjc -framework Foundation -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lang/objcxx/sample/Makefile b/lldb/packages/Python/lldbsuite/test/lang/objcxx/sample/Makefile index edd3430de7c8..c0b4b1a3470a 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/objcxx/sample/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/objcxx/sample/Makefile @@ -1,6 +1,4 @@ -LEVEL = ../../../make - OBJCXX_SOURCES := main.mm LDFLAGS = $(CFLAGS) -lobjc -framework Foundation -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/linux/add-symbols/Makefile b/lldb/packages/Python/lldbsuite/test/linux/add-symbols/Makefile index 71a5c11a83d1..fa3eadef65f5 100644 --- a/lldb/packages/Python/lldbsuite/test/linux/add-symbols/Makefile +++ b/lldb/packages/Python/lldbsuite/test/linux/add-symbols/Makefile @@ -1,4 +1,3 @@ -LEVEL = ../../make CXX_SOURCES := main.cpp LD_EXTRAS += -Wl,--build-id=none @@ -10,4 +9,4 @@ stripped.out : a.out clean:: $(RM) stripped.out -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/linux/builtin_trap/Makefile b/lldb/packages/Python/lldbsuite/test/linux/builtin_trap/Makefile index 8a7102e347af..99998b20bcb0 100644 --- a/lldb/packages/Python/lldbsuite/test/linux/builtin_trap/Makefile +++ b/lldb/packages/Python/lldbsuite/test/linux/builtin_trap/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/linux/mix-dwo-and-regular-objects/Makefile b/lldb/packages/Python/lldbsuite/test/linux/mix-dwo-and-regular-objects/Makefile index 7cfad32f8272..169460598a25 100644 --- a/lldb/packages/Python/lldbsuite/test/linux/mix-dwo-and-regular-objects/Makefile +++ b/lldb/packages/Python/lldbsuite/test/linux/mix-dwo-and-regular-objects/Makefile @@ -1,9 +1,7 @@ -LEVEL := ../../make - C_SOURCES := a.c b.c a.o: CFLAGS_EXTRAS += -gsplit-dwarf -include $(LEVEL)/Makefile.rules +include Makefile.rules .PHONY: clean clean:: diff --git a/lldb/packages/Python/lldbsuite/test/linux/sepdebugsymlink/Makefile b/lldb/packages/Python/lldbsuite/test/linux/sepdebugsymlink/Makefile index 3fd14a74bf36..a290c8c6f2e8 100644 --- a/lldb/packages/Python/lldbsuite/test/linux/sepdebugsymlink/Makefile +++ b/lldb/packages/Python/lldbsuite/test/linux/sepdebugsymlink/Makefile @@ -1,4 +1,3 @@ -LEVEL = ../../make C_SOURCES := main.c all: dirsymlink @@ -17,4 +16,4 @@ dirsymlink: dirreal clean:: $(RM) -r dirreal dirsymlink -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/linux/thread/create_during_instruction_step/Makefile b/lldb/packages/Python/lldbsuite/test/linux/thread/create_during_instruction_step/Makefile index 67aa16625bff..566938ca0cc4 100644 --- a/lldb/packages/Python/lldbsuite/test/linux/thread/create_during_instruction_step/Makefile +++ b/lldb/packages/Python/lldbsuite/test/linux/thread/create_during_instruction_step/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp ENABLE_THREADS := YES -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/lldbinline.py b/lldb/packages/Python/lldbsuite/test/lldbinline.py index 4c3b08bf1d0e..22668b673fda 100644 --- a/lldb/packages/Python/lldbsuite/test/lldbinline.py +++ b/lldb/packages/Python/lldbsuite/test/lldbinline.py @@ -101,11 +101,6 @@ class InlineTest(TestBase): makefile = open(makefilePath, 'w+') - level = os.sep.join( - [".."] * len(self.mydir.split(os.sep))) + os.sep + "make" - - makefile.write("LEVEL = " + level + "\n") - for t in list(categories.keys()): line = t + " := " + " ".join(categories[t]) makefile.write(line + "\n") @@ -118,7 +113,7 @@ class InlineTest(TestBase): if ('CXX_SOURCES' in list(categories.keys())): makefile.write("CXXFLAGS += -std=c++11\n") - makefile.write("include $(LEVEL)/Makefile.rules\n") + makefile.write("include Makefile.rules\n") makefile.write("\ncleanup:\n\trm -f Makefile *.d\n\n") makefile.flush() makefile.close() diff --git a/lldb/packages/Python/lldbsuite/test/macosx/duplicate-archive-members/Makefile b/lldb/packages/Python/lldbsuite/test/macosx/duplicate-archive-members/Makefile index 5bb3a3ce3f10..b880d9e722bf 100644 --- a/lldb/packages/Python/lldbsuite/test/macosx/duplicate-archive-members/Makefile +++ b/lldb/packages/Python/lldbsuite/test/macosx/duplicate-archive-members/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../make - C_SOURCES := main.c # Make an archive that has two object files with the same name, but @@ -14,7 +12,7 @@ libfoo.a: a.c sub1/a.c $(AR) $(ARFLAGS) $@ a.o sub1/a.o rm a.o sub1/a.o -include $(LEVEL)/Makefile.rules +include Makefile.rules # Needs to come after include OBJECTS += libfoo.a diff --git a/lldb/packages/Python/lldbsuite/test/macosx/find-app-in-bundle/Makefile b/lldb/packages/Python/lldbsuite/test/macosx/find-app-in-bundle/Makefile index 18a4934cca37..68012d22f5b9 100644 --- a/lldb/packages/Python/lldbsuite/test/macosx/find-app-in-bundle/Makefile +++ b/lldb/packages/Python/lldbsuite/test/macosx/find-app-in-bundle/Makefile @@ -1,5 +1,4 @@ SRCDIR := $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))/ - CC ?= clang ifeq "$(ARCH)" "" diff --git a/lldb/packages/Python/lldbsuite/test/macosx/find-dsym/bundle-with-dot-in-filename/Makefile b/lldb/packages/Python/lldbsuite/test/macosx/find-dsym/bundle-with-dot-in-filename/Makefile index 313c83e990d5..658c9a938705 100644 --- a/lldb/packages/Python/lldbsuite/test/macosx/find-dsym/bundle-with-dot-in-filename/Makefile +++ b/lldb/packages/Python/lldbsuite/test/macosx/find-dsym/bundle-with-dot-in-filename/Makefile @@ -1,5 +1,4 @@ SRCDIR := $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))/ - CC ?= clang ifeq "$(ARCH)" "" diff --git a/lldb/packages/Python/lldbsuite/test/macosx/find-dsym/deep-bundle/Makefile b/lldb/packages/Python/lldbsuite/test/macosx/find-dsym/deep-bundle/Makefile index d52d6f1f0d37..b2a66c2ad41e 100644 --- a/lldb/packages/Python/lldbsuite/test/macosx/find-dsym/deep-bundle/Makefile +++ b/lldb/packages/Python/lldbsuite/test/macosx/find-dsym/deep-bundle/Makefile @@ -1,5 +1,4 @@ SRCDIR := $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))/ - CC ?= clang ifeq "$(ARCH)" "" diff --git a/lldb/packages/Python/lldbsuite/test/macosx/function-starts/Makefile b/lldb/packages/Python/lldbsuite/test/macosx/function-starts/Makefile index 091876d51c35..0d6f51729393 100644 --- a/lldb/packages/Python/lldbsuite/test/macosx/function-starts/Makefile +++ b/lldb/packages/Python/lldbsuite/test/macosx/function-starts/Makefile @@ -1,10 +1,8 @@ -LEVEL = ../../make - CXX_SOURCES := main.cpp EXE := StripMe MAKE_DSYM := NO -include $(LEVEL)/Makefile.rules +include Makefile.rules main.o: main.cpp $(CC) $(CFLAGS_NO_DEBUG) -c $< -o $@ diff --git a/lldb/packages/Python/lldbsuite/test/macosx/indirect_symbol/Makefile b/lldb/packages/Python/lldbsuite/test/macosx/indirect_symbol/Makefile index 69fd86e575e6..5bea8dc4ab51 100644 --- a/lldb/packages/Python/lldbsuite/test/macosx/indirect_symbol/Makefile +++ b/lldb/packages/Python/lldbsuite/test/macosx/indirect_symbol/Makefile @@ -1,6 +1,4 @@ -LEVEL = ../../make - -include $(LEVEL)/Makefile.rules +include Makefile.rules LIB_PREFIX := lib diff --git a/lldb/packages/Python/lldbsuite/test/macosx/lc-note/kern-ver-str/Makefile b/lldb/packages/Python/lldbsuite/test/macosx/lc-note/kern-ver-str/Makefile index b440cf321891..af03cf6ff5dc 100644 --- a/lldb/packages/Python/lldbsuite/test/macosx/lc-note/kern-ver-str/Makefile +++ b/lldb/packages/Python/lldbsuite/test/macosx/lc-note/kern-ver-str/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - MAKE_DSYM := NO C_SOURCES := main.c @@ -12,4 +10,4 @@ create-empty-corefile: clean:: $(MAKE) -f create-empty-corefile.mk clean -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/macosx/lc-note/kern-ver-str/create-empty-corefile.mk b/lldb/packages/Python/lldbsuite/test/macosx/lc-note/kern-ver-str/create-empty-corefile.mk index 4d3e320f0415..4967e956679a 100644 --- a/lldb/packages/Python/lldbsuite/test/macosx/lc-note/kern-ver-str/create-empty-corefile.mk +++ b/lldb/packages/Python/lldbsuite/test/macosx/lc-note/kern-ver-str/create-empty-corefile.mk @@ -1,8 +1,6 @@ -LEVEL = ../../../make - MAKE_DSYM := NO CXX_SOURCES := create-empty-corefile.cpp EXE = create-empty-corefile -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/macosx/nslog/Makefile b/lldb/packages/Python/lldbsuite/test/macosx/nslog/Makefile index de2b618b3d70..a68dad547ec6 100644 --- a/lldb/packages/Python/lldbsuite/test/macosx/nslog/Makefile +++ b/lldb/packages/Python/lldbsuite/test/macosx/nslog/Makefile @@ -1,6 +1,4 @@ -LEVEL = ../../make - OBJC_SOURCES := main.m LD_EXTRAS = -framework Foundation -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/macosx/order/Makefile b/lldb/packages/Python/lldbsuite/test/macosx/order/Makefile index ff5f1886ef56..357a6032bcd2 100644 --- a/lldb/packages/Python/lldbsuite/test/macosx/order/Makefile +++ b/lldb/packages/Python/lldbsuite/test/macosx/order/Makefile @@ -1,7 +1,5 @@ -LEVEL = ../../make - C_SOURCES := main.c LDFLAGS = $(CFLAGS) -Xlinker -order_file -Xlinker $(SRCDIR)/order-file MAKE_DSYM := NO -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/macosx/queues/Makefile b/lldb/packages/Python/lldbsuite/test/macosx/queues/Makefile index 0d70f2595019..10495940055b 100644 --- a/lldb/packages/Python/lldbsuite/test/macosx/queues/Makefile +++ b/lldb/packages/Python/lldbsuite/test/macosx/queues/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/macosx/safe-to-func-call/Makefile b/lldb/packages/Python/lldbsuite/test/macosx/safe-to-func-call/Makefile index 0d70f2595019..10495940055b 100644 --- a/lldb/packages/Python/lldbsuite/test/macosx/safe-to-func-call/Makefile +++ b/lldb/packages/Python/lldbsuite/test/macosx/safe-to-func-call/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/macosx/thread-names/Makefile b/lldb/packages/Python/lldbsuite/test/macosx/thread-names/Makefile index 0d70f2595019..10495940055b 100644 --- a/lldb/packages/Python/lldbsuite/test/macosx/thread-names/Makefile +++ b/lldb/packages/Python/lldbsuite/test/macosx/thread-names/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/macosx/universal/Makefile b/lldb/packages/Python/lldbsuite/test/macosx/universal/Makefile index a83de2a6c7e6..efdeb1fd1313 100644 --- a/lldb/packages/Python/lldbsuite/test/macosx/universal/Makefile +++ b/lldb/packages/Python/lldbsuite/test/macosx/universal/Makefile @@ -1,8 +1,6 @@ -LEVEL := ../../make - EXE := testit -include $(LEVEL)/Makefile.rules +include Makefile.rules all: testit diff --git a/lldb/packages/Python/lldbsuite/test/plugins/builder_base.py b/lldb/packages/Python/lldbsuite/test/plugins/builder_base.py index 44695cecf210..e6bc9a083809 100644 --- a/lldb/packages/Python/lldbsuite/test/plugins/builder_base.py +++ b/lldb/packages/Python/lldbsuite/test/plugins/builder_base.py @@ -75,6 +75,7 @@ def getMake(test_subdir, test_name): "VPATH="+src_dir, "-C", build_dir, "-I", src_dir, + "-I", os.path.join(lldb_test, "make"), "-f", makefile] diff --git a/lldb/packages/Python/lldbsuite/test/python_api/breakpoint/Makefile b/lldb/packages/Python/lldbsuite/test/python_api/breakpoint/Makefile index 0d70f2595019..10495940055b 100644 --- a/lldb/packages/Python/lldbsuite/test/python_api/breakpoint/Makefile +++ b/lldb/packages/Python/lldbsuite/test/python_api/breakpoint/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/python_api/class_members/Makefile b/lldb/packages/Python/lldbsuite/test/python_api/class_members/Makefile index 0d7550f9f282..6f34ff7dd843 100644 --- a/lldb/packages/Python/lldbsuite/test/python_api/class_members/Makefile +++ b/lldb/packages/Python/lldbsuite/test/python_api/class_members/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../make - OBJCXX_SOURCES := main.mm -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/python_api/event/Makefile b/lldb/packages/Python/lldbsuite/test/python_api/event/Makefile index 0d70f2595019..10495940055b 100644 --- a/lldb/packages/Python/lldbsuite/test/python_api/event/Makefile +++ b/lldb/packages/Python/lldbsuite/test/python_api/event/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/python_api/findvalue_duplist/Makefile b/lldb/packages/Python/lldbsuite/test/python_api/findvalue_duplist/Makefile index ddffdcfb62d6..b5256564c2f1 100644 --- a/lldb/packages/Python/lldbsuite/test/python_api/findvalue_duplist/Makefile +++ b/lldb/packages/Python/lldbsuite/test/python_api/findvalue_duplist/Makefile @@ -1,8 +1,6 @@ -LEVEL = ../../make - CXX_SOURCES := main.cpp # Clean renamed executable on 'make clean' clean: OBJECTS+=no_synth -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/python_api/formatters/Makefile b/lldb/packages/Python/lldbsuite/test/python_api/formatters/Makefile index ddffdcfb62d6..b5256564c2f1 100644 --- a/lldb/packages/Python/lldbsuite/test/python_api/formatters/Makefile +++ b/lldb/packages/Python/lldbsuite/test/python_api/formatters/Makefile @@ -1,8 +1,6 @@ -LEVEL = ../../make - CXX_SOURCES := main.cpp # Clean renamed executable on 'make clean' clean: OBJECTS+=no_synth -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/python_api/frame/Makefile b/lldb/packages/Python/lldbsuite/test/python_api/frame/Makefile index 0d70f2595019..10495940055b 100644 --- a/lldb/packages/Python/lldbsuite/test/python_api/frame/Makefile +++ b/lldb/packages/Python/lldbsuite/test/python_api/frame/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/python_api/frame/get-variables/Makefile b/lldb/packages/Python/lldbsuite/test/python_api/frame/get-variables/Makefile index b09a579159d4..10495940055b 100644 --- a/lldb/packages/Python/lldbsuite/test/python_api/frame/get-variables/Makefile +++ b/lldb/packages/Python/lldbsuite/test/python_api/frame/get-variables/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/python_api/frame/inlines/Makefile b/lldb/packages/Python/lldbsuite/test/python_api/frame/inlines/Makefile index 641ee5d96ca6..4cb3dc98c8c1 100644 --- a/lldb/packages/Python/lldbsuite/test/python_api/frame/inlines/Makefile +++ b/lldb/packages/Python/lldbsuite/test/python_api/frame/inlines/Makefile @@ -1,9 +1,7 @@ -LEVEL = ../../../make - C_SOURCES := inlines.c ifneq (,$(findstring icc,$(CC))) CFLAGS += -debug inline-debug-info endif -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/python_api/function_symbol/Makefile b/lldb/packages/Python/lldbsuite/test/python_api/function_symbol/Makefile index 0d70f2595019..10495940055b 100644 --- a/lldb/packages/Python/lldbsuite/test/python_api/function_symbol/Makefile +++ b/lldb/packages/Python/lldbsuite/test/python_api/function_symbol/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/python_api/hello_world/Makefile b/lldb/packages/Python/lldbsuite/test/python_api/hello_world/Makefile index 9976203b63bb..73625f4733f0 100644 --- a/lldb/packages/Python/lldbsuite/test/python_api/hello_world/Makefile +++ b/lldb/packages/Python/lldbsuite/test/python_api/hello_world/Makefile @@ -1,7 +1,5 @@ -LEVEL = ../../make - C_SOURCES := main.c # See TestHelloWorld.py, which specifies the executable name with a dictionary. EXE := hello_world -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/python_api/interpreter/Makefile b/lldb/packages/Python/lldbsuite/test/python_api/interpreter/Makefile index 0d70f2595019..10495940055b 100644 --- a/lldb/packages/Python/lldbsuite/test/python_api/interpreter/Makefile +++ b/lldb/packages/Python/lldbsuite/test/python_api/interpreter/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/python_api/lldbutil/frame/Makefile b/lldb/packages/Python/lldbsuite/test/python_api/lldbutil/frame/Makefile index 69b74b5d7531..c5fa38429c63 100644 --- a/lldb/packages/Python/lldbsuite/test/python_api/lldbutil/frame/Makefile +++ b/lldb/packages/Python/lldbsuite/test/python_api/lldbutil/frame/Makefile @@ -1,6 +1,4 @@ -LEVEL = ../../../make - C_SOURCES := main.c MAKE_DSYM :=NO -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/python_api/lldbutil/iter/Makefile b/lldb/packages/Python/lldbsuite/test/python_api/lldbutil/iter/Makefile index 051354123495..200bdafd69fe 100644 --- a/lldb/packages/Python/lldbsuite/test/python_api/lldbutil/iter/Makefile +++ b/lldb/packages/Python/lldbsuite/test/python_api/lldbutil/iter/Makefile @@ -1,8 +1,6 @@ -LEVEL = ../../../make - CFLAGS_EXTRAS += -D__STDC_LIMIT_MACROS ENABLE_THREADS := YES CXX_SOURCES := main.cpp MAKE_DSYM := NO -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/python_api/lldbutil/process/Makefile b/lldb/packages/Python/lldbsuite/test/python_api/lldbutil/process/Makefile index 93fc28b4ee07..938161724be5 100644 --- a/lldb/packages/Python/lldbsuite/test/python_api/lldbutil/process/Makefile +++ b/lldb/packages/Python/lldbsuite/test/python_api/lldbutil/process/Makefile @@ -1,8 +1,6 @@ -LEVEL = ../../../make - CFLAGS_EXTRAS += -D__STDC_LIMIT_MACROS ENABLE_THREADS := YES CXX_SOURCES := main.cpp MAKE_DSYM :=NO -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/python_api/module_section/Makefile b/lldb/packages/Python/lldbsuite/test/python_api/module_section/Makefile index ee74ebae1f42..5eed4cb698c4 100644 --- a/lldb/packages/Python/lldbsuite/test/python_api/module_section/Makefile +++ b/lldb/packages/Python/lldbsuite/test/python_api/module_section/Makefile @@ -1,8 +1,6 @@ -LEVEL = ../../make - CFLAGS_EXTRAS += -D__STDC_LIMIT_MACROS ENABLE_THREADS := YES CXX_SOURCES := main.cpp b.cpp c.cpp MAKE_DSYM :=NO -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/python_api/name_lookup/Makefile b/lldb/packages/Python/lldbsuite/test/python_api/name_lookup/Makefile index 8a7102e347af..99998b20bcb0 100644 --- a/lldb/packages/Python/lldbsuite/test/python_api/name_lookup/Makefile +++ b/lldb/packages/Python/lldbsuite/test/python_api/name_lookup/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/python_api/objc_type/Makefile b/lldb/packages/Python/lldbsuite/test/python_api/objc_type/Makefile index 31e57fe28a58..03b578913862 100644 --- a/lldb/packages/Python/lldbsuite/test/python_api/objc_type/Makefile +++ b/lldb/packages/Python/lldbsuite/test/python_api/objc_type/Makefile @@ -1,9 +1,7 @@ -LEVEL = ../../make - OBJC_SOURCES := main.m CFLAGS_EXTRAS += -w -include $(LEVEL)/Makefile.rules +include Makefile.rules LDFLAGS += -framework Foundation diff --git a/lldb/packages/Python/lldbsuite/test/python_api/process/Makefile b/lldb/packages/Python/lldbsuite/test/python_api/process/Makefile index 8a7102e347af..99998b20bcb0 100644 --- a/lldb/packages/Python/lldbsuite/test/python_api/process/Makefile +++ b/lldb/packages/Python/lldbsuite/test/python_api/process/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/python_api/process/io/Makefile b/lldb/packages/Python/lldbsuite/test/python_api/process/io/Makefile index 5361f2a5bbea..4aa78325888a 100644 --- a/lldb/packages/Python/lldbsuite/test/python_api/process/io/Makefile +++ b/lldb/packages/Python/lldbsuite/test/python_api/process/io/Makefile @@ -1,6 +1,4 @@ -LEVEL = ../../../make - C_SOURCES := main.c EXE := process_io -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/python_api/process/read-mem-cstring/Makefile b/lldb/packages/Python/lldbsuite/test/python_api/process/read-mem-cstring/Makefile index f3414925f32b..6bc1b47f1f3d 100644 --- a/lldb/packages/Python/lldbsuite/test/python_api/process/read-mem-cstring/Makefile +++ b/lldb/packages/Python/lldbsuite/test/python_api/process/read-mem-cstring/Makefile @@ -1,6 +1,4 @@ -LEVEL = ../../../make - C_SOURCES := main.c EXE := read-mem-cstring -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/python_api/rdar-12481949/Makefile b/lldb/packages/Python/lldbsuite/test/python_api/rdar-12481949/Makefile index 8a7102e347af..99998b20bcb0 100644 --- a/lldb/packages/Python/lldbsuite/test/python_api/rdar-12481949/Makefile +++ b/lldb/packages/Python/lldbsuite/test/python_api/rdar-12481949/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/python_api/sbdata/Makefile b/lldb/packages/Python/lldbsuite/test/python_api/sbdata/Makefile index 8a7102e347af..99998b20bcb0 100644 --- a/lldb/packages/Python/lldbsuite/test/python_api/sbdata/Makefile +++ b/lldb/packages/Python/lldbsuite/test/python_api/sbdata/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/python_api/sbvalue_const_addrof/Makefile b/lldb/packages/Python/lldbsuite/test/python_api/sbvalue_const_addrof/Makefile index a9c1edd1bdcf..29c68ae57401 100644 --- a/lldb/packages/Python/lldbsuite/test/python_api/sbvalue_const_addrof/Makefile +++ b/lldb/packages/Python/lldbsuite/test/python_api/sbvalue_const_addrof/Makefile @@ -1,4 +1,3 @@ -LEVEL = ../../make CXX_SOURCES := main.cpp CXXFLAGS += -std=c++11 -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/python_api/sbvalue_persist/Makefile b/lldb/packages/Python/lldbsuite/test/python_api/sbvalue_persist/Makefile index ddffdcfb62d6..b5256564c2f1 100644 --- a/lldb/packages/Python/lldbsuite/test/python_api/sbvalue_persist/Makefile +++ b/lldb/packages/Python/lldbsuite/test/python_api/sbvalue_persist/Makefile @@ -1,8 +1,6 @@ -LEVEL = ../../make - CXX_SOURCES := main.cpp # Clean renamed executable on 'make clean' clean: OBJECTS+=no_synth -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/python_api/section/Makefile b/lldb/packages/Python/lldbsuite/test/python_api/section/Makefile index 0d70f2595019..10495940055b 100644 --- a/lldb/packages/Python/lldbsuite/test/python_api/section/Makefile +++ b/lldb/packages/Python/lldbsuite/test/python_api/section/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/python_api/signals/Makefile b/lldb/packages/Python/lldbsuite/test/python_api/signals/Makefile index 8a7102e347af..99998b20bcb0 100644 --- a/lldb/packages/Python/lldbsuite/test/python_api/signals/Makefile +++ b/lldb/packages/Python/lldbsuite/test/python_api/signals/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/python_api/symbol-context/Makefile b/lldb/packages/Python/lldbsuite/test/python_api/symbol-context/Makefile index 0d70f2595019..10495940055b 100644 --- a/lldb/packages/Python/lldbsuite/test/python_api/symbol-context/Makefile +++ b/lldb/packages/Python/lldbsuite/test/python_api/symbol-context/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/python_api/symbol-context/two-files/Makefile b/lldb/packages/Python/lldbsuite/test/python_api/symbol-context/two-files/Makefile index 650a8b261bea..ccaa0edcf5f7 100644 --- a/lldb/packages/Python/lldbsuite/test/python_api/symbol-context/two-files/Makefile +++ b/lldb/packages/Python/lldbsuite/test/python_api/symbol-context/two-files/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := file1.cpp file2.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/python_api/target/Makefile b/lldb/packages/Python/lldbsuite/test/python_api/target/Makefile index 0d70f2595019..10495940055b 100644 --- a/lldb/packages/Python/lldbsuite/test/python_api/target/Makefile +++ b/lldb/packages/Python/lldbsuite/test/python_api/target/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/python_api/thread/Makefile b/lldb/packages/Python/lldbsuite/test/python_api/thread/Makefile index aa257ae2bd2a..30749db9a67c 100644 --- a/lldb/packages/Python/lldbsuite/test/python_api/thread/Makefile +++ b/lldb/packages/Python/lldbsuite/test/python_api/thread/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../make - CXX_SOURCES ?= main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/python_api/type/Makefile b/lldb/packages/Python/lldbsuite/test/python_api/type/Makefile index 8a7102e347af..99998b20bcb0 100644 --- a/lldb/packages/Python/lldbsuite/test/python_api/type/Makefile +++ b/lldb/packages/Python/lldbsuite/test/python_api/type/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/python_api/value/Makefile b/lldb/packages/Python/lldbsuite/test/python_api/value/Makefile index 0d70f2595019..10495940055b 100644 --- a/lldb/packages/Python/lldbsuite/test/python_api/value/Makefile +++ b/lldb/packages/Python/lldbsuite/test/python_api/value/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/python_api/value/change_values/Makefile b/lldb/packages/Python/lldbsuite/test/python_api/value/change_values/Makefile index b09a579159d4..10495940055b 100644 --- a/lldb/packages/Python/lldbsuite/test/python_api/value/change_values/Makefile +++ b/lldb/packages/Python/lldbsuite/test/python_api/value/change_values/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/python_api/value/empty_class/Makefile b/lldb/packages/Python/lldbsuite/test/python_api/value/empty_class/Makefile index 314f1cb2f077..99998b20bcb0 100644 --- a/lldb/packages/Python/lldbsuite/test/python_api/value/empty_class/Makefile +++ b/lldb/packages/Python/lldbsuite/test/python_api/value/empty_class/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/python_api/value/linked_list/Makefile b/lldb/packages/Python/lldbsuite/test/python_api/value/linked_list/Makefile index 314f1cb2f077..99998b20bcb0 100644 --- a/lldb/packages/Python/lldbsuite/test/python_api/value/linked_list/Makefile +++ b/lldb/packages/Python/lldbsuite/test/python_api/value/linked_list/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/python_api/value_var_update/Makefile b/lldb/packages/Python/lldbsuite/test/python_api/value_var_update/Makefile index 4b0e5814e3e3..95cdf295fbcf 100644 --- a/lldb/packages/Python/lldbsuite/test/python_api/value_var_update/Makefile +++ b/lldb/packages/Python/lldbsuite/test/python_api/value_var_update/Makefile @@ -1,8 +1,6 @@ -LEVEL = ../../make - C_SOURCES := main.c CFLAGS_EXTRAS += -std=c99 # See TestHelloWorld.py, which specifies the executable name with a dictionary. EXE := hello_world -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/python_api/watchpoint/Makefile b/lldb/packages/Python/lldbsuite/test/python_api/watchpoint/Makefile index 0d70f2595019..10495940055b 100644 --- a/lldb/packages/Python/lldbsuite/test/python_api/watchpoint/Makefile +++ b/lldb/packages/Python/lldbsuite/test/python_api/watchpoint/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/python_api/watchpoint/condition/Makefile b/lldb/packages/Python/lldbsuite/test/python_api/watchpoint/condition/Makefile index 314f1cb2f077..99998b20bcb0 100644 --- a/lldb/packages/Python/lldbsuite/test/python_api/watchpoint/condition/Makefile +++ b/lldb/packages/Python/lldbsuite/test/python_api/watchpoint/condition/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/python_api/watchpoint/watchlocation/Makefile b/lldb/packages/Python/lldbsuite/test/python_api/watchpoint/watchlocation/Makefile index 8817fff55e8c..de4ec12b13cb 100644 --- a/lldb/packages/Python/lldbsuite/test/python_api/watchpoint/watchlocation/Makefile +++ b/lldb/packages/Python/lldbsuite/test/python_api/watchpoint/watchlocation/Makefile @@ -1,6 +1,4 @@ -LEVEL = ../../../make - ENABLE_THREADS := YES CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/sample_test/Makefile b/lldb/packages/Python/lldbsuite/test/sample_test/Makefile index 0e5a537bbec8..aa5f222c08e3 100644 --- a/lldb/packages/Python/lldbsuite/test/sample_test/Makefile +++ b/lldb/packages/Python/lldbsuite/test/sample_test/Makefile @@ -1,6 +1,4 @@ -LEVEL = ../make - C_SOURCES := main.c CFLAGS_EXTRAS += -std=c99 -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/source-manager/Makefile b/lldb/packages/Python/lldbsuite/test/source-manager/Makefile index 5d19a27a2df2..a78dc11e0713 100644 --- a/lldb/packages/Python/lldbsuite/test/source-manager/Makefile +++ b/lldb/packages/Python/lldbsuite/test/source-manager/Makefile @@ -1,8 +1,6 @@ -LEVEL = ../make - C_SOURCES := main-copy.c -include $(LEVEL)/Makefile.rules +include Makefile.rules # Copy file into the build folder to enable the test to modify it. main-copy.c: main.c diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/Makefile b/lldb/packages/Python/lldbsuite/test/tools/lldb-server/Makefile index 28aba3cf5463..1e0987a3022b 100644 --- a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/Makefile +++ b/lldb/packages/Python/lldbsuite/test/tools/lldb-server/Makefile @@ -1,8 +1,6 @@ -LEVEL = ../../make - override CFLAGS_EXTRAS += -D__STDC_LIMIT_MACROS -D__STDC_FORMAT_MACROS ENABLE_THREADS := YES CXX_SOURCES := main.cpp MAKE_DSYM :=NO -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/inferior-crash/Makefile b/lldb/packages/Python/lldbsuite/test/tools/lldb-server/inferior-crash/Makefile index a47e2797fd84..7fe9a3e92a74 100644 --- a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/inferior-crash/Makefile +++ b/lldb/packages/Python/lldbsuite/test/tools/lldb-server/inferior-crash/Makefile @@ -1,8 +1,6 @@ -LEVEL = ../../../make - CFLAGS_EXTRAS += -D__STDC_LIMIT_MACROS -D__STDC_FORMAT_MACROS -std=c++11 # LD_EXTRAS := -lpthread CXX_SOURCES := main.cpp MAKE_DSYM :=NO -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/libraries-svr4/Makefile b/lldb/packages/Python/lldbsuite/test/tools/lldb-server/libraries-svr4/Makefile index 265c8ca3c410..e5ed078d1e35 100644 --- a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/libraries-svr4/Makefile +++ b/lldb/packages/Python/lldbsuite/test/tools/lldb-server/libraries-svr4/Makefile @@ -1,12 +1,10 @@ -LEVEL = ../../../make - LIB_PREFIX := svr4lib LD_EXTRAS := -L. -l$(LIB_PREFIX)_a -l$(LIB_PREFIX)_b\" CXX_SOURCES := main.cpp USE_LIBDL := 1 MAKE_DSYM := NO -include $(LEVEL)/Makefile.rules +include Makefile.rules a.out: $(LIB_PREFIX)_a $(LIB_PREFIX)_b_quote diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/libraries-svr4/svr4lib_a.mk b/lldb/packages/Python/lldbsuite/test/tools/lldb-server/libraries-svr4/svr4lib_a.mk index 626babbd6b29..3d741857c023 100644 --- a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/libraries-svr4/svr4lib_a.mk +++ b/lldb/packages/Python/lldbsuite/test/tools/lldb-server/libraries-svr4/svr4lib_a.mk @@ -1,9 +1,7 @@ -LEVEL = ../../../make - LIB_PREFIX := svr4lib DYLIB_NAME := $(LIB_PREFIX)_a DYLIB_CXX_SOURCES := $(LIB_PREFIX)_a.cpp DYLIB_ONLY := YES -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/libraries-svr4/svr4lib_b_quote.mk b/lldb/packages/Python/lldbsuite/test/tools/lldb-server/libraries-svr4/svr4lib_b_quote.mk index 5ed7a053b42a..fc20cf05c4eb 100644 --- a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/libraries-svr4/svr4lib_b_quote.mk +++ b/lldb/packages/Python/lldbsuite/test/tools/lldb-server/libraries-svr4/svr4lib_b_quote.mk @@ -1,9 +1,7 @@ -LEVEL = ../../../make - LIB_PREFIX := svr4lib DYLIB_NAME := $(LIB_PREFIX)_b\" DYLIB_CXX_SOURCES := $(LIB_PREFIX)_b_quote.cpp DYLIB_ONLY := YES -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/platform-process-connect/Makefile b/lldb/packages/Python/lldbsuite/test/tools/lldb-server/platform-process-connect/Makefile index 314f1cb2f077..99998b20bcb0 100644 --- a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/platform-process-connect/Makefile +++ b/lldb/packages/Python/lldbsuite/test/tools/lldb-server/platform-process-connect/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/register-reading/Makefile b/lldb/packages/Python/lldbsuite/test/tools/lldb-server/register-reading/Makefile index 314f1cb2f077..99998b20bcb0 100644 --- a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/register-reading/Makefile +++ b/lldb/packages/Python/lldbsuite/test/tools/lldb-server/register-reading/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/signal-filtering/Makefile b/lldb/packages/Python/lldbsuite/test/tools/lldb-server/signal-filtering/Makefile index 314f1cb2f077..99998b20bcb0 100644 --- a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/signal-filtering/Makefile +++ b/lldb/packages/Python/lldbsuite/test/tools/lldb-server/signal-filtering/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/thread-name/Makefile b/lldb/packages/Python/lldbsuite/test/tools/lldb-server/thread-name/Makefile index 8817fff55e8c..de4ec12b13cb 100644 --- a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/thread-name/Makefile +++ b/lldb/packages/Python/lldbsuite/test/tools/lldb-server/thread-name/Makefile @@ -1,6 +1,4 @@ -LEVEL = ../../../make - ENABLE_THREADS := YES CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-vscode/attach/Makefile b/lldb/packages/Python/lldbsuite/test/tools/lldb-vscode/attach/Makefile index b09a579159d4..10495940055b 100644 --- a/lldb/packages/Python/lldbsuite/test/tools/lldb-vscode/attach/Makefile +++ b/lldb/packages/Python/lldbsuite/test/tools/lldb-vscode/attach/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-vscode/breakpoint/Makefile b/lldb/packages/Python/lldbsuite/test/tools/lldb-vscode/breakpoint/Makefile index 314f1cb2f077..99998b20bcb0 100644 --- a/lldb/packages/Python/lldbsuite/test/tools/lldb-vscode/breakpoint/Makefile +++ b/lldb/packages/Python/lldbsuite/test/tools/lldb-vscode/breakpoint/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-vscode/launch/Makefile b/lldb/packages/Python/lldbsuite/test/tools/lldb-vscode/launch/Makefile index b09a579159d4..10495940055b 100644 --- a/lldb/packages/Python/lldbsuite/test/tools/lldb-vscode/launch/Makefile +++ b/lldb/packages/Python/lldbsuite/test/tools/lldb-vscode/launch/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-vscode/stackTrace/Makefile b/lldb/packages/Python/lldbsuite/test/tools/lldb-vscode/stackTrace/Makefile index b09a579159d4..10495940055b 100644 --- a/lldb/packages/Python/lldbsuite/test/tools/lldb-vscode/stackTrace/Makefile +++ b/lldb/packages/Python/lldbsuite/test/tools/lldb-vscode/stackTrace/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-vscode/step/Makefile b/lldb/packages/Python/lldbsuite/test/tools/lldb-vscode/step/Makefile index f24bb9f4d267..b7f3072e28c9 100644 --- a/lldb/packages/Python/lldbsuite/test/tools/lldb-vscode/step/Makefile +++ b/lldb/packages/Python/lldbsuite/test/tools/lldb-vscode/step/Makefile @@ -1,7 +1,5 @@ -LEVEL = ../../../make - ENABLE_THREADS := YES CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-vscode/variables/Makefile b/lldb/packages/Python/lldbsuite/test/tools/lldb-vscode/variables/Makefile index 314f1cb2f077..99998b20bcb0 100644 --- a/lldb/packages/Python/lldbsuite/test/tools/lldb-vscode/variables/Makefile +++ b/lldb/packages/Python/lldbsuite/test/tools/lldb-vscode/variables/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/types/Makefile b/lldb/packages/Python/lldbsuite/test/types/Makefile index c1b4cb32561d..d48ed7688a47 100644 --- a/lldb/packages/Python/lldbsuite/test/types/Makefile +++ b/lldb/packages/Python/lldbsuite/test/types/Makefile @@ -1,7 +1,5 @@ -LEVEL = ../make - # Example: # # CXX_SOURCES := int.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules -- 2.34.1