diff options
Diffstat (limited to 'packages/Python/lldbsuite/test/make')
| -rw-r--r-- | packages/Python/lldbsuite/test/make/Android.rules | 8 | ||||
| -rw-r--r-- | packages/Python/lldbsuite/test/make/Makefile.rules | 34 |
2 files changed, 33 insertions, 9 deletions
diff --git a/packages/Python/lldbsuite/test/make/Android.rules b/packages/Python/lldbsuite/test/make/Android.rules index 058401f425ad7..f7b8e2459611f 100644 --- a/packages/Python/lldbsuite/test/make/Android.rules +++ b/packages/Python/lldbsuite/test/make/Android.rules @@ -8,7 +8,7 @@ else ifeq "$(ARCH)" "i386" API_LEVEL := 17 else # lowest supported 32-bit API level - API_LEVEL := 9 + API_LEVEL := 16 endif ifeq "$(ARCH)" "arm" @@ -18,8 +18,8 @@ ifeq "$(ARCH)" "arm" ARCH_CFLAGS += -march=armv7-a -mfloat-abi=softfp -mfpu=vfpv3-d16 -marm else ifeq "$(ARCH)" "aarch64" SYSROOT_ARCH := arm64 - TRIPLE := aarch64-none-linux-android STL_ARCH := arm64-v8a + TRIPLE := aarch64-none-linux-android else ifeq "$(ARCH)" "i386" SYSROOT_ARCH := x86 STL_ARCH := x86 @@ -70,7 +70,9 @@ ifeq "$(findstring clang,$(CC))" "clang" ARCH_LDFLAGS += -target $(TRIPLE) -gcc-toolchain $(GCC_TOOLCHAIN) endif -ARCH_CFLAGS += --sysroot=$(NDK_ROOT)/platforms/android-$(API_LEVEL)/arch-$(SYSROOT_ARCH) +ARCH_CFLAGS += --sysroot=$(NDK_ROOT)/sysroot \ + -isystem $(NDK_ROOT)/sysroot/usr/include/$(TOOL_PREFIX) \ + -D__ANDROID_API__=$(API_LEVEL) ARCH_LDFLAGS += --sysroot=$(NDK_ROOT)/platforms/android-$(API_LEVEL)/arch-$(SYSROOT_ARCH) -lm ifeq (1,$(USE_LIBCPP)) diff --git a/packages/Python/lldbsuite/test/make/Makefile.rules b/packages/Python/lldbsuite/test/make/Makefile.rules index a7b94ef573808..4870cd95f80af 100644 --- a/packages/Python/lldbsuite/test/make/Makefile.rules +++ b/packages/Python/lldbsuite/test/make/Makefile.rules @@ -78,6 +78,24 @@ ifneq "$(TRIPLE)" "" endif endif endif + ifeq "$(TRIPLE_OS)" "watchos" + ifeq "$(SDKROOT)" "" + # Set SDKROOT if it wasn't set + ifneq (,$(findstring arm,$(ARCH))) + SDKROOT = $(shell xcrun --sdk watchos --show-sdk-path) + ifeq "$(TRIPLE_VERSION)" "" + TRIPLE_VERSION =$(shell echo $(notdir $(SDKROOT)) | sed -e 's/.*\([0-9]\.[0-9]\).*/\1/') + endif + ARCH_CFLAGS :=-mwatchos-version-min=$(TRIPLE_VERSION) -isysroot "$(SDKROOT)" + else + SDKROOT = $(shell xcrun --sdk watchsimulator --show-sdk-path) + ifeq "$(TRIPLE_VERSION)" "" + TRIPLE_VERSION =$(shell echo $(notdir $(SDKROOT)) | sed -e 's/.*\([0-9]\.[0-9]\).*/\1/') + endif + ARCH_CFLAGS :=-mwatchos-simulator-version-min=$(TRIPLE_VERSION) -isysroot "$(SDKROOT)" + endif + endif + endif endif endif ifeq "$(OS)" "Android" @@ -163,6 +181,9 @@ else ifeq "$(ARCH)" "powerpc64" override ARCH := $(subst powerpc64,64,$(ARCH)) endif + ifeq "$(ARCH)" "powerpc64le" + override ARCH := $(subst powerpc64le,64,$(ARCH)) + endif ifeq "$(ARCH)" "aarch64" override ARCH := override ARCHFLAG := @@ -197,18 +218,19 @@ DEBUG_INFO_FLAG ?= -g CFLAGS ?= $(DEBUG_INFO_FLAG) -O0 -fno-builtin ifeq "$(OS)" "Darwin" - CFLAGS += $(ARCHFLAG) $(ARCH) $(FRAMEWORK_INCLUDES) $(CFLAGS_EXTRAS) -I$(LLDB_BASE_DIR)include + CFLAGS += $(ARCHFLAG) $(ARCH) $(FRAMEWORK_INCLUDES) -I$(LLDB_BASE_DIR)include else - CFLAGS += $(ARCHFLAG)$(ARCH) $(FRAMEWORK_INCLUDES) $(CFLAGS_EXTRAS) -I$(LLDB_BASE_DIR)include + CFLAGS += $(ARCHFLAG)$(ARCH) $(FRAMEWORK_INCLUDES) -I$(LLDB_BASE_DIR)include endif -CFLAGS += -include $(THIS_FILE_DIR)test_common.h -I$(THIS_FILE_DIR) $(ARCH_CFLAGS) +CFLAGS += -include $(THIS_FILE_DIR)test_common.h -I$(THIS_FILE_DIR) +CFLAGS += $(NO_LIMIT_DEBUG_INFO_FLAGS) $(ARCH_CFLAGS) $(CFLAGS_EXTRAS) # Use this one if you want to build one part of the result without debug information: ifeq "$(OS)" "Darwin" - CFLAGS_NO_DEBUG = -O0 $(ARCHFLAG) $(ARCH) $(FRAMEWORK_INCLUDES) $(CFLAGS_EXTRAS) $(ARCH_CFLAGS) + CFLAGS_NO_DEBUG = -O0 $(ARCHFLAG) $(ARCH) $(FRAMEWORK_INCLUDES) $(ARCH_CFLAGS) $(CFLAGS_EXTRAS) else - CFLAGS_NO_DEBUG = -O0 $(ARCHFLAG)$(ARCH) $(FRAMEWORK_INCLUDES) $(CFLAGS_EXTRAS) $(ARCH_CFLAGS) + CFLAGS_NO_DEBUG = -O0 $(ARCHFLAG)$(ARCH) $(FRAMEWORK_INCLUDES) $(ARCH_CFLAGS) $(CFLAGS_EXTRAS) endif ifeq "$(MAKE_DWO)" "YES" @@ -225,7 +247,7 @@ CXXFLAGS += $(subst -fmodules,, $(CFLAGS)) LD = $(CC) LDFLAGS ?= $(CFLAGS) LDFLAGS += $(LD_EXTRAS) $(ARCH_LDFLAGS) -ifeq (,$(filter $(OS), Windows_NT Android)) +ifeq (,$(filter $(OS), Windows_NT Android Darwin)) ifneq (,$(filter YES,$(ENABLE_THREADS))) LDFLAGS += -pthread endif |