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 538269 - Set HOST_AR_FLAG like HOST_AR, r=ted

Browse Source 
--HG--
extra : rebase_source : 7d96f2c97970ad7c086e51ce99a08918e507aa1f
This commit is contained in:
Michael Wu 2010-02-03 14:40:34 -08:00
parent d2f5cee6ad
commit 57d6c1880d
2 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
configure.in
View File

@ -248,6 +248,9 @@ dnl Set CROSS_COMPILE in the environment when running configure
dnl to use the cross-compile setup for now
dnl ========================================================
dnl AR_FLAGS set here so HOST_AR_FLAGS can be set correctly (see bug 538269)
AR_FLAGS='cr $@'
if test "$COMPILE_ENVIRONMENT"; then
dnl Do some special WinCE toolchain stuff
@ -326,6 +329,9 @@ if test -n "$CROSS_COMPILE" && test "$target" != "$host"; then
if test -z "$HOST_LDFLAGS"; then
HOST_LDFLAGS="$LDFLAGS"
fi
if test -z "$HOST_AR_FLAGS"; then
HOST_AR_FLAGS="$AR_FLAGS"
fi
AC_CHECK_PROGS(HOST_RANLIB, $HOST_RANLIB ranlib, ranlib, :)
AC_CHECK_PROGS(HOST_AR, $HOST_AR ar, ar, :)
CC="$HOST_CC"
@ -415,7 +421,10 @@ else
HOST_RANLIB="$RANLIB"
fi
if test -z "$HOST_AR"; then
HOST_AR="$AR"
HOST_AR="$AR"
fi
if test -z "$HOST_AR_FLAGS"; then
HOST_AR_FLAGS="$AR_FLAGS"
fi
fi
@ -1030,7 +1039,6 @@ dnl ========================================================
dnl set the defaults first
dnl ========================================================
AS_BIN=$AS
AR_FLAGS='cr $@'
AR_LIST='$(AR) t'
AR_EXTRACT='$(AR) x'
AR_DELETE='$(AR) d'
@ -1048,7 +1056,6 @@ DIRENT_INO=d_ino
CYGWIN_WRAPPER=
WIN_TOP_SRC=
MOZ_USER_DIR=".mozilla"
HOST_AR_FLAGS='$(AR_FLAGS)'
MOZ_JPEG_CFLAGS=
MOZ_JPEG_LIBS='$(call EXPAND_LIBNAME_PATH,mozjpeg,$(DEPTH)/jpeg)'

13
js/src/configure.in
View File

@ -210,6 +210,9 @@ dnl ========================================================
dnl Checks for compilers.
dnl ========================================================
dnl AR_FLAGS set here so HOST_AR_FLAGS can be set correctly (see bug 538269)
AR_FLAGS='cr $@'
if test "$COMPILE_ENVIRONMENT"; then
if test "$target" != "$host"; then
@ -241,6 +244,9 @@ if test "$target" != "$host"; then
if test -z "$HOST_LDFLAGS"; then
HOST_LDFLAGS="$LDFLAGS"
fi
if test -z "$HOST_AR_FLAGS"; then
HOST_AR_FLAGS="$AR_FLAGS"
fi
AC_CHECK_PROGS(HOST_RANLIB, $HOST_RANLIB ranlib, ranlib, :)
AC_CHECK_PROGS(HOST_AR, $HOST_AR ar, ar, :)
CC="$HOST_CC"
@ -370,7 +376,10 @@ else
HOST_RANLIB="$RANLIB"
fi
if test -z "$HOST_AR"; then
HOST_AR="$AR"
HOST_AR="$AR"
fi
if test -z "$HOST_AR_FLAGS"; then
HOST_AR_FLAGS="$AR_FLAGS"
fi
fi
@ -870,7 +879,6 @@ dnl ========================================================
dnl set the defaults first
dnl ========================================================
AS_BIN=$AS
AR_FLAGS='cr $@'
AR_LIST='$(AR) t'
AR_EXTRACT='$(AR) x'
AR_DELETE='$(AR) d'
@ -888,7 +896,6 @@ DIRENT_INO=d_ino
CYGWIN_WRAPPER=
WIN_TOP_SRC=
MOZ_USER_DIR=".mozilla"
HOST_AR_FLAGS='$(AR_FLAGS)'
MOZ_JS_LIBS='-L$(libdir) -lmozjs'
MOZ_FIX_LINK_PATHS='-Wl,-rpath-link,$(LIBXUL_DIST)/bin -Wl,-rpath-link,$(PREFIX)/lib'