summaryrefslogtreecommitdiff
path: root/cross
diff options
context:
space:
mode:
authorCyd Haselton <chaselton@gmail.com>2017-08-11 20:14:36 (GMT)
committerJan Kotas <jkotas@microsoft.com>2017-08-11 20:14:36 (GMT)
commit78298734845ffbf3cdd75736ebad71dfa1856aba (patch)
tree01e70f87e556af9466829d71f74a26a59a8f95e2 /cross
parent1a55fa5b9881c256078090f0d2ad4961c96c2865 (diff)
downloadcoreclr-78298734845ffbf3cdd75736ebad71dfa1856aba.zip
coreclr-78298734845ffbf3cdd75736ebad71dfa1856aba.tar.gz
coreclr-78298734845ffbf3cdd75736ebad71dfa1856aba.tar.bz2
Changes that didn't make it to PR#12982 (#13055)
* Changes that didn't make it to PR#12982 * Recommended changes to volatile.h Added two templates to cast away volatility due to clang 3.8 changes * Update runtime.Linux.Microsoft.NETCore.Runtime.CoreCLR.props Fixed erroneous extra Platform conditional line
Diffstat (limited to 'cross')
-rw-r--r--cross/android/arm64/toolchain.cmake4
1 files changed, 4 insertions, 0 deletions
diff --git a/cross/android/arm64/toolchain.cmake b/cross/android/arm64/toolchain.cmake
index 60f8c78..2941589 100644
--- a/cross/android/arm64/toolchain.cmake
+++ b/cross/android/arm64/toolchain.cmake
@@ -22,6 +22,10 @@ find_program(CMAKE_OBJDUMP ${TOOLCHAIN_PREFIX}objdump)
add_compile_options(--sysroot=${CROSS_ROOTFS})
add_compile_options(-fPIE)
+## Needed for Android or bionic specific conditionals
+add_compile_options(-D__ANDROID__)
+add_compile_options(-D__BIONIC__)
+
set(CROSS_LINK_FLAGS "${CROSS_LINK_FLAGS} -B ${CROSS_ROOTFS}/usr/lib/gcc/${TOOLCHAIN}")
set(CROSS_LINK_FLAGS "${CROSS_LINK_FLAGS} -L${CROSS_ROOTFS}/lib/${TOOLCHAIN}")
set(CROSS_LINK_FLAGS "${CROSS_LINK_FLAGS} --sysroot=${CROSS_ROOTFS}")