wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1220476 - Make --disable-compile-environment work for Android builds without an Android NDK. r=glandium

Browse Source
This commit is contained in:
Nick Alexander 2015-11-02 16:46:42 -08:00
parent b695cede38
commit 0c4804847f
2 changed files with 26 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
build/autoconf/android.m4
View File

@ -188,8 +188,8 @@ case "$target" in
esac
])
AC_DEFUN([MOZ_ANDROID_STLPORT],
AC_DEFUN([MOZ_ANDROID_CPU_ARCH],
[
if test "$OS_TARGET" = "Android" -a -z "$gonkdir"; then
@ -209,7 +209,13 @@ if test "$OS_TARGET" = "Android" -a -z "$gonkdir"; then
esac
AC_SUBST(ANDROID_CPU_ARCH)
fi
])
AC_DEFUN([MOZ_ANDROID_STLPORT],
[
if test "$OS_TARGET" = "Android" -a -z "$gonkdir"; then
cpu_arch_dir="$ANDROID_CPU_ARCH"
if test "$MOZ_THUMB2" = 1; then
cpu_arch_dir="$cpu_arch_dir/thumb"

21
configure.in
View File

@ -321,7 +321,11 @@ if test -n "$gonkdir" ; then
direct_nspr_config=1
android_cxx_stl=mozstlport
else
MOZ_ANDROID_NDK
if test "$COMPILE_ENVIRONMENT"; then
MOZ_ANDROID_NDK
else
AC_DEFINE(ANDROID)
fi # COMPILE_ENVIRONMENT
case "$target" in
*-android*|*-linuxandroid*)
@ -1197,7 +1201,14 @@ esac
dnl Configure platform-specific CPU architecture compiler options.
dnl ==============================================================
MOZ_ARCH_OPTS
if test "$COMPILE_ENVIRONMENT"; then
MOZ_ARCH_OPTS
else
if test "$OS_TARGET" = Android -a x"$MOZ_WIDGET_TOOLKIT" != x"gonk"; then
dnl Default Android builds to ARMv7.
MOZ_ARCH=armv7-a
fi
fi # COMPILE_ENVIRONMENT
dnl =================================================================
dnl Set up and test static assertion macros used to avoid AC_TRY_RUN,
@ -1246,7 +1257,10 @@ dnl Android libstdc++, placed here so it can use MOZ_ARCH
dnl computed above.
dnl ========================================================
MOZ_ANDROID_STLPORT
MOZ_ANDROID_CPU_ARCH
if test "$COMPILE_ENVIRONMENT"; then
MOZ_ANDROID_STLPORT
fi # COMPILE_ENVIRONMENT
dnl ========================================================
dnl Suppress Clang Argument Warnings
@ -2532,6 +2546,7 @@ esac
if test -z "$COMPILE_ENVIRONMENT"; then
SKIP_COMPILER_CHECKS=1
SKIP_LIBRARY_CHECKS=1
PKG_SKIP_STRIP=1
else
MOZ_COMPILER_OPTS
fi # COMPILE_ENVIRONMENT