diff options
| author | Yang Ni <yangni@google.com> | 2016-12-12 14:02:35 -0800 |
|---|---|---|
| committer | Yang Ni <yangni@google.com> | 2016-12-12 14:03:00 -0800 |
| commit | 66b9d46c7016a3a74717f0003c6eec4b81f1d24a (patch) | |
| tree | bb484f51912009ab247e2c67c00c7d4adde075f8 | |
| parent | a4eb334c79d78bbd63feff3780572f4213f82aba (diff) | |
| download | spirv-llvm-66b9d46c7016a3a74717f0003c6eec4b81f1d24a.tar.gz | |
Enable darwin build
Test: mm
Change-Id: I560d07e9dc4b3a226b5d5985563c0dac7ce2a604
| -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 \ |