diff options
author | Yang Ni <yangni@google.com> | 2016-12-12 22:14:41 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-12-12 22:14:41 +0000 |
commit | 12476d414abff14c9cbf7ba2de375aa866f77349 (patch) | |
tree | bb484f51912009ab247e2c67c00c7d4adde075f8 | |
parent | b7af82162dc5eafdf2ac19fd0160ecc5c7741dde (diff) | |
parent | a117dc79f70fba5621c3f809c4c5847409620bab (diff) | |
download | spirv-llvm-12476d414abff14c9cbf7ba2de375aa866f77349.tar.gz |
Merge "Enable darwin build"
am: a117dc79f7
Change-Id: I845a240c8e59264fe49b3961e95f9179ea6aec4d
-rw-r--r-- | lib/SPIRV/Android.mk | 5 | ||||
-rw-r--r-- | tools/llvm-spirv/Android.mk | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/lib/SPIRV/Android.mk b/lib/SPIRV/Android.mk index 2e669d76..65b74378 100644 --- a/lib/SPIRV/Android.mk +++ b/lib/SPIRV/Android.mk @@ -87,14 +87,15 @@ LOCAL_MODULE := libSPIRV # TODO: test windows build -LOCAL_MODULE_HOST_OS := linux +LOCAL_MODULE_HOST_OS := linux darwin LOCAL_MODULE_CLASS := SHARED_LIBRARIES LOCAL_IS_HOST_MODULE := true LOCAL_MULTILIB := first LOCAL_LDLIBS_linux := -lrt -ldl -ltinfo -lpthread +LOCAL_LDLIBS_darwin := -ldl -lpthread -LOCAL_SHARED_LIBRARIES_linux += libLLVM +LOCAL_SHARED_LIBRARIES += libLLVM LOCAL_CFLAGS += $(TOOL_CFLAGS) \ -D_SPIRV_LLVM_API \ diff --git a/tools/llvm-spirv/Android.mk b/tools/llvm-spirv/Android.mk index 20c9f5da..ec7f3b28 100644 --- a/tools/llvm-spirv/Android.mk +++ b/tools/llvm-spirv/Android.mk @@ -49,12 +49,13 @@ LOCAL_MODULE_CLASS := EXECUTABLES # TODO: handle windows and darwin -LOCAL_MODULE_HOST_OS := linux +LOCAL_MODULE_HOST_OS := linux darwin LOCAL_IS_HOST_MODULE := true LOCAL_LDLIBS_linux := -lrt -ldl -ltinfo -lpthread +LOCAL_LDLIBS_darwin := -ldl -lpthread -LOCAL_SHARED_LIBRARIES_linux += libLLVM libSPIRV +LOCAL_SHARED_LIBRARIES += libLLVM libSPIRV LOCAL_CFLAGS += $(TOOL_CFLAGS) \ -D_SPIRV_LLVM_API \ |