diff options
| author | wtc%google.com <devnull@localhost> | 2008-07-12 14:23:46 +0000 |
|---|---|---|
| committer | wtc%google.com <devnull@localhost> | 2008-07-12 14:23:46 +0000 |
| commit | 9ee3ae6715d66e13a6573f4001d622348736e700 (patch) | |
| tree | eef6322dbd324d0a024ab079c9fb5d6b8febf9ab | |
| parent | 405155090aba9546a5b8610d73abc9230875b585 (diff) | |
| download | nspr-hg-9ee3ae6715d66e13a6573f4001d622348736e700.tar.gz | |
Bug 436806: On FreeBSD, assume elf instead of a.out if the objformat
utility is not available. The patch is contributed by Marco Perez
<bugmail@millibyte.net>. r=wtc.
| -rwxr-xr-x | configure | 4 | ||||
| -rw-r--r-- | configure.in | 4 |
2 files changed, 4 insertions, 4 deletions
@@ -3513,7 +3513,7 @@ EOF EOF CFLAGS="$CFLAGS $(DSO_CFLAGS) -ansi -Wall" - MOZ_OBJFORMAT=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` + MOZ_OBJFORMAT=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` if test "$MOZ_OBJFORMAT" = "elf"; then DLL_SUFFIX=so else @@ -4891,7 +4891,7 @@ EOF ;; esac if test "$CPU_ARCH" = "sparc"; then - # 64-bit SPARC Solaris requires V9 architecture, so the following + # 64-bit Solaris SPARC requires V9 architecture, so the following # is not needed. if test -z "$USE_64"; then ULTRASPARC_LIBRARY=nspr_flt diff --git a/configure.in b/configure.in index 4a32efef..e7a1e99e 100644 --- a/configure.in +++ b/configure.in @@ -1166,7 +1166,7 @@ tools are selected during the Xcode/Developer Tools installation.]) AC_DEFINE(HAVE_BSD_FLOCK) AC_DEFINE(HAVE_SOCKLEN_T) CFLAGS="$CFLAGS $(DSO_CFLAGS) -ansi -Wall" - MOZ_OBJFORMAT=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` + MOZ_OBJFORMAT=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` if test "$MOZ_OBJFORMAT" = "elf"; then DLL_SUFFIX=so else @@ -2090,7 +2090,7 @@ mips-sony-newsos*) ;; esac if test "$CPU_ARCH" = "sparc"; then - # 64-bit SPARC Solaris requires V9 architecture, so the following + # 64-bit Solaris SPARC requires V9 architecture, so the following # is not needed. if test -z "$USE_64"; then ULTRASPARC_LIBRARY=nspr_flt |