Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-16 22:04:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix for 293042: enable Solaris builds with gcc and enable 64 bit builds as well

Browse Source
This commit is contained in:
richm%stanfordalumni.org 2005-05-10 20:08:39 +00:00
parent 9c5d89e6a2
commit 13a9f2055a
3 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
directory/c-sdk/config/SunOS5.mk
View File

@ -108,16 +108,19 @@ ifndef INTERNAL_TOOLS
ifneq ($(NS_USE_GCC), 1) ifneq ($(NS_USE_GCC), 1)
CC += -xarch=v9 CC += -xarch=v9
CCC += -xarch=v9 CCC += -xarch=v9
endif
endif
COMPILER_TAG = _64
else else
CC += -m64
CCC += -m64
endif # NS_USE_GCC
endif # INTERNAL_TOOLS
COMPILER_TAG += _64
else # USE_64
ifeq ($(HAVE_CCONF), 1) ifeq ($(HAVE_CCONF), 1)
COMPILER_TAG = COMPILER_TAG =
else else
COMPILER_TAG = _32 COMPILER_TAG += _32
endif endif # HAVE_CCONF
endif endif # USE_64
RANLIB = echo RANLIB = echo

7
directory/c-sdk/configure vendored
View File

@ -4701,6 +4701,7 @@ EOF
CFLAGS="$CFLAGS -MDupdate \$(DEPENDENCIES)" CFLAGS="$CFLAGS -MDupdate \$(DEPENDENCIES)"
CXXFLAGS="$CXXFLAGS -MDupdate \$(DEPENDENCIES)" CXXFLAGS="$CXXFLAGS -MDupdate \$(DEPENDENCIES)"
fi fi
COMPILER_TAG=_gcc
else else
CC="$CC -xstrconst" CC="$CC -xstrconst"
CXX="$CXX -Qoption cg -xstrconst" CXX="$CXX -Qoption cg -xstrconst"
@ -4713,6 +4714,10 @@ EOF
CC="$CC -xarch=v9" CC="$CC -xarch=v9"
CXX="$CXX -xarch=v9" CXX="$CXX -xarch=v9"
fi fi
if test -n "$USE_64" && test "$GNU_CC"; then
CC="$CC -m64"
CXX="$CXX -m64"
fi
if test "$OS_TEST" = "i86pc"; then if test "$OS_TEST" = "i86pc"; then
cat >> confdefs.h <<\EOF cat >> confdefs.h <<\EOF
#define i386 1 #define i386 1
@ -5539,7 +5544,7 @@ else
fi fi
if test -n "$USE_64"; then if test -n "$USE_64"; then
COMPILER_TAG=_64 COMPILER_TAG=${COMPILER_TAG}_64
fi fi
RELEASE_OBJDIR_NAME="${OS_CONFIG}${CPU_ARCH_TAG}${COMPILER_TAG}${IMPL_STRATEGY}${OBJDIR_TAG}.${OBJDIR_SUFFIX}" RELEASE_OBJDIR_NAME="${OS_CONFIG}${CPU_ARCH_TAG}${COMPILER_TAG}${IMPL_STRATEGY}${OBJDIR_TAG}.${OBJDIR_SUFFIX}"

7
directory/c-sdk/configure.in
View File

@ -1706,6 +1706,7 @@ mips-sony-newsos*)
CFLAGS="$CFLAGS -MDupdate \$(DEPENDENCIES)" CFLAGS="$CFLAGS -MDupdate \$(DEPENDENCIES)"
CXXFLAGS="$CXXFLAGS -MDupdate \$(DEPENDENCIES)" CXXFLAGS="$CXXFLAGS -MDupdate \$(DEPENDENCIES)"
fi fi
COMPILER_TAG=_gcc
else else
CC="$CC -xstrconst" CC="$CC -xstrconst"
CXX="$CXX -Qoption cg -xstrconst" CXX="$CXX -Qoption cg -xstrconst"
@ -1718,6 +1719,10 @@ mips-sony-newsos*)
CC="$CC -xarch=v9" CC="$CC -xarch=v9"
CXX="$CXX -xarch=v9" CXX="$CXX -xarch=v9"
fi fi
if test -n "$USE_64" && test -n "$GNU_CC"; then
CC="$CC -m64"
CXX="$CXX -m64"
fi
if test "$OS_TEST" = "i86pc"; then if test "$OS_TEST" = "i86pc"; then
AC_DEFINE(i386) AC_DEFINE(i386)
CPU_ARCH_TAG=_$OS_TEST CPU_ARCH_TAG=_$OS_TEST
@ -2216,7 +2221,7 @@ else
fi fi
if test -n "$USE_64"; then if test -n "$USE_64"; then
COMPILER_TAG=_64 COMPILER_TAG=${COMPILER_TAG}_64
fi fi
RELEASE_OBJDIR_NAME="${OS_CONFIG}${CPU_ARCH_TAG}${COMPILER_TAG}${IMPL_STRATEGY}${OBJDIR_TAG}.${OBJDIR_SUFFIX}" RELEASE_OBJDIR_NAME="${OS_CONFIG}${CPU_ARCH_TAG}${COMPILER_TAG}${IMPL_STRATEGY}${OBJDIR_TAG}.${OBJDIR_SUFFIX}"