diff options
| author | Jason Molenda <jmolenda@apple.com> | 2019-12-10 18:46:24 -0800 |
|---|---|---|
| committer | Jason Molenda <jmolenda@apple.com> | 2019-12-10 18:48:40 -0800 |
| commit | af3aac9a227eaf38b625137b7337365b32404068 (patch) | |
| tree | 459f671643c3717cb0c4e7507f909473b49efb84 /lldb/packages/Python/lldbsuite/test | |
| parent | caa412090666c10f854322cdc701c1cbf8ed726e (diff) | |
| download | bcm5719-llvm-af3aac9a227eaf38b625137b7337365b32404068.tar.gz bcm5719-llvm-af3aac9a227eaf38b625137b7337365b32404068.zip | |
Change the mtc Makefile to check $SDKROOT value instead
of depending on it being set in the environment. Fred's change
from October assumed that SDKROOT was set in the environment
so that 'xcrun --show-sdk-path' would print the path. If it
was passed in as a Makefile variable, it wouldn't be set in
the environment and xcrun --show-sdk-path would always show the
macOS SDK path. When running the lldb testsuite against an ios
device via lit, this seems to be the case.
Diffstat (limited to 'lldb/packages/Python/lldbsuite/test')
| -rw-r--r-- | lldb/packages/Python/lldbsuite/test/functionalities/mtc/simple/Makefile | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/mtc/simple/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/mtc/simple/Makefile index 1b231a5958d..f27f57aeebf 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/mtc/simple/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/mtc/simple/Makefile @@ -1,9 +1,14 @@ OBJC_SOURCES := main.m -ifeq ($(findstring MacOSX.platform,$(shell xcrun --show-sdk-path)),MacOSX.platform) UI_FRAMEWORK = AppKit -else -UI_FRAMEWORK = UIKit + +ifneq ("$(SDKROOT)", "") + ifeq (,$(findstring macOS,$(SDKROOT))) + ifeq (,$(findstring MacOS,$(SDKROOT))) + UI_FRAMEWORK = UIKit + endif + endif endif + LD_EXTRAS = -lobjc -framework Foundation -framework $(UI_FRAMEWORK) include Makefile.rules |
