diff options
Diffstat (limited to 'lldb/packages/Python/lldbsuite/test/commands/expression')
11 files changed, 20 insertions, 17 deletions
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 33746217ecb..becb2f09658 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/expression/call-throws/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/expression/call-throws/Makefile @@ -1,4 +1,3 @@ OBJC_SOURCES := call-throws.m - +LD_EXTRAS := -framework Foundation include Makefile.rules -LDFLAGS += -framework Foundation 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 2f36b673031..a3198db9e8e 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,4 +1,3 @@ OBJC_SOURCES := main.m - +LD_EXTRAS := -framework Foundation include Makefile.rules -LDFLAGS += -framework Foundation 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 aa5f222c08e..695335e068c 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,4 +1,4 @@ C_SOURCES := main.c -CFLAGS_EXTRAS += -std=c99 +CFLAGS_EXTRAS := -std=c99 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 4aa2b432f12..019a94d53a9 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/sysroot/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/sysroot/Makefile @@ -3,6 +3,7 @@ # system headers. NO_TEST_COMMON_H := 1 -CXXFLAGS += -I $(SRCDIR)/root/usr/include/c++/include/ -I $(SRCDIR)/root/usr/include/ -nostdinc -nostdinc++ -nostdlib++ +CXXFLAGS_EXTRAS := -I $(SRCDIR)/root/usr/include/c++/include/ -I $(SRCDIR)/root/usr/include/ -nostdinc -nostdinc++ -nostdlib++ CXX_SOURCES := main.cpp + include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/import_builtin_fileid/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/import_builtin_fileid/Makefile index 780b2660cd0..b46bd7f39a9 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,4 +1,3 @@ OBJC_SOURCES := main.m - +LD_EXTRAS := -framework Cocoa include Makefile.rules -LDFLAGS += -framework Cocoa 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 9267f734396..4d12ff1b43e 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,4 +1,5 @@ OBJCXX_SOURCES := main.mm util.mm -include Makefile.rules -LDFLAGS += -framework Foundation + +LD_EXTRAS := -framework Foundation +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 add737b4752..69a2ad6b8d8 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,5 +1,6 @@ OBJC_SOURCES := main.m -include Makefile.rules -LDFLAGS += -framework Foundation -framework CloudKit +LD_EXTRAS := -framework Foundation -framework CloudKit + +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 2f36b673031..9e812e1cf78 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/expression/po_verbosity/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/expression/po_verbosity/Makefile @@ -1,4 +1,5 @@ OBJC_SOURCES := main.m + +LD_EXTRAS := -framework Foundation include Makefile.rules -LDFLAGS += -framework Foundation 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 4b46fe22a8b..4eb417eeb57 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/expression/scoped_enums/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/expression/scoped_enums/Makefile @@ -1,4 +1,5 @@ CXX_SOURCES := main.cpp -CXXFLAGS += -std=c++11 +CXXFLAGS_EXTRAS := -std=c++11 + 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 b8b1d12fe2b..c82383d9400 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/expression/two-files/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/expression/two-files/Makefile @@ -1,5 +1,6 @@ OBJC_SOURCES := main.m foo.m -include Makefile.rules -LDFLAGS += -framework Foundation + +LD_EXTRAS := -framework Foundation +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 9786ff38a84..c8b38907ac9 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/expression/weak_symbols/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/expression/weak_symbols/Makefile @@ -1,4 +1,4 @@ -CFLAGS_EXTRAS += -std=c99 +CFLAGS_EXTRAS := -std=c99 LD_FLAGS := -dynamiclib include Makefile.rules |
