diff options
| author | Tor Lillqvist <tml@collabora.com> | 2014-08-30 00:33:42 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2014-08-30 01:03:33 +0300 |
| commit | 5c004922b2fc167c826350085f7d996d93b4398e (patch) | |
| tree | b7a03c82f4afa588015992e334b612ac0cd50bca /bridges/Library_cpp_uno.mk | |
| parent | 0da23c09222caecdf5944c1f2da17dddeb10f1c5 (diff) | |
Start of support for Android on AArch64
The build does not get far before it runs into trouble in the GNU libstdc++
headers, though:
android-ndk-r10/sources/cxx-stl/gnu-libstdc++/4.9/libs/x86/include/bits/opt_random.h:33:23:
fatal error: x86intrin.h: No such file or directory
Change-Id: I9d459c64980091ba8bf5b3d631d47342625f6be9
Diffstat (limited to 'bridges/Library_cpp_uno.mk')
| -rw-r--r-- | bridges/Library_cpp_uno.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/bridges/Library_cpp_uno.mk b/bridges/Library_cpp_uno.mk index 96bd293e1e1c..33a5c00e0c1f 100644 --- a/bridges/Library_cpp_uno.mk +++ b/bridges/Library_cpp_uno.mk @@ -35,7 +35,7 @@ $(call gb_LinkTarget_get_target,$(call gb_Library_get_linktarget,gcc3_uno)) : \ EXTRAOBJECTLISTS += $(call gb_CustomTarget_get_workdir,bridges/source/cpp_uno/gcc3_linux_arm)/armhelper.objectlist endif -else ifeq ($(OS)-$(CPUNAME),LINUX-AARCH64) +else ifneq (,$(filter ANDROID-AARCH64 LINUX-AARCH64,$(OS)-$(CPUNAME))) bridges_SELECTED_BRIDGE := gcc3_linux_aarch64 bridge_exception_objects := abi callvirtualfunction cpp2uno uno2cpp |