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 856404 - Don't default HOST_* variables to target ones when cross compiling. r=ted

Browse Source
This commit is contained in:
Jacek Caban 2015-04-29 10:50:00 -04:00
parent 0b2e75f4be
commit 5c47478200
2 changed files with 0 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
nsprpub/configure vendored
View File

@ -2666,19 +2666,6 @@ fi
if test -n "$gonkdir" ; then if test -n "$gonkdir" ; then
if test -z "$HOST_CPPFLAGS" ; then
HOST_CPPFLAGS=" "
fi
if test -z "$HOST_CFLAGS" ; then
HOST_CFLAGS=" "
fi
if test -z "$HOST_CXXFLAGS" ; then
HOST_CXXFLAGS=" "
fi
if test -z "$HOST_LDFLAGS" ; then
HOST_LDFLAGS=" "
fi
$as_echo "#define ANDROID 1" >>confdefs.h $as_echo "#define ANDROID 1" >>confdefs.h
else else
@ -2763,19 +2750,6 @@ $as_echo "$android_platform" >&6; }
CXXFLAGS="-mandroid -I$android_platform/usr/include -fpic -fno-short-enums -fno-exceptions $CXXFLAGS" CXXFLAGS="-mandroid -I$android_platform/usr/include -fpic -fno-short-enums -fno-exceptions $CXXFLAGS"
LDFLAGS="-mandroid -L$android_platform/usr/lib -Wl,-rpath-link=$android_platform/usr/lib --sysroot=$android_platform $LDFLAGS" LDFLAGS="-mandroid -L$android_platform/usr/lib -Wl,-rpath-link=$android_platform/usr/lib --sysroot=$android_platform $LDFLAGS"
if test -z "$HOST_CPPFLAGS" ; then
HOST_CPPFLAGS=" "
fi
if test -z "$HOST_CFLAGS" ; then
HOST_CFLAGS=" "
fi
if test -z "$HOST_CXXFLAGS" ; then
HOST_CXXFLAGS=" "
fi
if test -z "$HOST_LDFLAGS" ; then
HOST_LDFLAGS=" "
fi
$as_echo "#define ANDROID 1" >>confdefs.h $as_echo "#define ANDROID 1" >>confdefs.h
;; ;;
@ -4621,12 +4595,6 @@ test -n "$HOST_CC" || HOST_CC=""""
fi fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $HOST_CC" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $HOST_CC" >&5
$as_echo "$HOST_CC" >&6; } $as_echo "$HOST_CC" >&6; }
if test -z "$HOST_CFLAGS"; then
HOST_CFLAGS="$CFLAGS"
fi
if test -z "$HOST_LDFLAGS"; then
HOST_LDFLAGS="$LDFLAGS"
fi
CC="$HOST_CC" CC="$HOST_CC"
CFLAGS="$HOST_CFLAGS" CFLAGS="$HOST_CFLAGS"

34
nsprpub/configure.in
View File

@ -160,20 +160,6 @@ AC_ARG_WITH(gonk,
if test -n "$gonkdir" ; then if test -n "$gonkdir" ; then
dnl Most things are directly configured by env vars when building for gonk dnl Most things are directly configured by env vars when building for gonk
dnl prevent cross compile section from using these flags as host flags
if test -z "$HOST_CPPFLAGS" ; then
HOST_CPPFLAGS=" "
fi
if test -z "$HOST_CFLAGS" ; then
HOST_CFLAGS=" "
fi
if test -z "$HOST_CXXFLAGS" ; then
HOST_CXXFLAGS=" "
fi
if test -z "$HOST_LDFLAGS" ; then
HOST_LDFLAGS=" "
fi
AC_DEFINE(ANDROID) AC_DEFINE(ANDROID)
else else
case "$target" in case "$target" in
@ -257,20 +243,6 @@ case "$target" in
CXXFLAGS="-mandroid -I$android_platform/usr/include -fpic -fno-short-enums -fno-exceptions $CXXFLAGS" CXXFLAGS="-mandroid -I$android_platform/usr/include -fpic -fno-short-enums -fno-exceptions $CXXFLAGS"
LDFLAGS="-mandroid -L$android_platform/usr/lib -Wl,-rpath-link=$android_platform/usr/lib --sysroot=$android_platform $LDFLAGS" LDFLAGS="-mandroid -L$android_platform/usr/lib -Wl,-rpath-link=$android_platform/usr/lib --sysroot=$android_platform $LDFLAGS"
dnl prevent cross compile section from using these flags as host flags
if test -z "$HOST_CPPFLAGS" ; then
HOST_CPPFLAGS=" "
fi
if test -z "$HOST_CFLAGS" ; then
HOST_CFLAGS=" "
fi
if test -z "$HOST_CXXFLAGS" ; then
HOST_CXXFLAGS=" "
fi
if test -z "$HOST_LDFLAGS" ; then
HOST_LDFLAGS=" "
fi
AC_DEFINE(ANDROID) AC_DEFINE(ANDROID)
;; ;;
esac esac
@ -653,12 +625,6 @@ if test "$target" != "$host"; then
AC_MSG_ERROR([no acceptable cc found in \$PATH]) AC_MSG_ERROR([no acceptable cc found in \$PATH])
fi fi
AC_MSG_RESULT([$HOST_CC]) AC_MSG_RESULT([$HOST_CC])
if test -z "$HOST_CFLAGS"; then
HOST_CFLAGS="$CFLAGS"
fi
if test -z "$HOST_LDFLAGS"; then
HOST_LDFLAGS="$LDFLAGS"
fi
CC="$HOST_CC" CC="$HOST_CC"
CFLAGS="$HOST_CFLAGS" CFLAGS="$HOST_CFLAGS"