diff options
| author | Jacek Caban <jacek@codeweavers.com> | 2015-05-18 18:27:04 -0700 |
|---|---|---|
| committer | Jacek Caban <jacek@codeweavers.com> | 2015-05-18 18:27:04 -0700 |
| commit | 7ce676bd82d7f5d4a3523dea10949a8248b6cfd4 (patch) | |
| tree | a0d745c478d9814971903ef4084b5a979c2a402d | |
| parent | 101563f40090075802d506818bc56758a0867bee (diff) | |
| download | nspr-hg-7ce676bd82d7f5d4a3523dea10949a8248b6cfd4.tar.gz | |
Bug 856404 - Don't default HOST_* variables to target ones when
cross compiling. r=ted
| -rwxr-xr-x | configure | 32 | ||||
| -rw-r--r-- | configure.in | 34 |
2 files changed, 0 insertions, 66 deletions
@@ -2666,19 +2666,6 @@ fi 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 else @@ -2763,19 +2750,6 @@ $as_echo "$android_platform" >&6; } 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" - 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 ;; @@ -4621,12 +4595,6 @@ test -n "$HOST_CC" || HOST_CC="""" fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $HOST_CC" >&5 $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" CFLAGS="$HOST_CFLAGS" diff --git a/configure.in b/configure.in index 78b2f9a6..8af6f6b5 100644 --- a/configure.in +++ b/configure.in @@ -160,20 +160,6 @@ AC_ARG_WITH(gonk, if test -n "$gonkdir" ; then 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) else case "$target" in @@ -257,20 +243,6 @@ case "$target" in 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" - 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) ;; esac @@ -653,12 +625,6 @@ if test "$target" != "$host"; then AC_MSG_ERROR([no acceptable cc found in \$PATH]) fi 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" CFLAGS="$HOST_CFLAGS" |