Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-09 03:15:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1283678 - pass variables to libffi's subconfigure directly rather than exporting them; r=glandium

Browse Source 
MozReview-Commit-ID: C0m0rURELqf
This commit is contained in:
Nathan Froyd 2016-07-04 16:24:40 -07:00 committed by Jeff Gilbert
parent 52088a4e09
commit da61f509c2
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
build/autoconf/ffi.m4
View File

@ -43,10 +43,14 @@ if test "$MOZ_BUILD_APP" != js -o -n "$JS_STANDALONE"; then
if test -n "$CLANG_CC" -a "$CPU_ARCH" = arm; then
CFLAGS="-no-integrated-as $CFLAGS"
fi
if test "$CROSS_COMPILE"; then
export CPPFLAGS CFLAGS LDFLAGS
fi
ac_configure_args="$ac_configure_args --build=$build --host=$target"
if test "$CROSS_COMPILE"; then
ac_configure_args="$ac_configure_args \
CFLAGS=\"$CFLAGS\" \
CPPFLAGS=\"$CPPFLAGS\" \
LDFLAGS=\"$LDFLAGS\""
fi
CFLAGS="$old_cflags"
if test "$_MSC_VER"; then
# Use a wrapper script for cl and ml that looks more like gcc.
# autotools can't quite handle an MSVC build environment yet.
@ -83,7 +87,6 @@ if test "$MOZ_BUILD_APP" != js -o -n "$JS_STANDALONE"; then
AC_OUTPUT_SUBDIRS(js/src/ctypes/libffi)
ac_configure_args="$_SUBDIR_CONFIG_ARGS"
CONFIG_FILES=$old_config_files
CFLAGS="$old_cflags"
fi
fi