Commit 6b6222f6 authored by briano%netscape.com's avatar briano%netscape.com
Browse files

Fix to properly support Sun's WorkShop compilers. Thanks to Tim Rowley (tor@boojum.cs.brown.edu).

parent 3b15c090

config/autoconf.mk.in

+4 −3
Original line number Diff line number Diff line
@@ -82,6 +82,7 @@ XCFLAGS = @XCFLAGS@ 
XLDFLAGS	= @XLDFLAGS@

XLIBS		= @XLIBS@



AR		= @AR@

AS		= @AS@

ASFLAGS		= @ASFLAGS@

AS_DASH_C_FLAG	= @AS_DASH_C_FLAG@

config/config.mk

+0 −1
Original line number Diff line number Diff line
@@ -231,7 +231,6 @@ INSTALL = $(NSINSTALL) 
JAVA_PROG	= java

else

PATH_SEPARATOR	:= :

AR		= ar cr $@

ifndef USE_AUTOCONF

DLL_SUFFIX	= so

endif

configure.in

+7 −6
Original line number Diff line number Diff line
@@ -171,6 +171,7 @@ AC_SUBST(GNU_CXX) 


dnl set the defaults first

dnl ========================================================

AR='ar cr $@'

AS=

AS_DASH_C_FLAG='-c'

NS_USE_NATIVE=
@@ -268,6 +269,7 @@ case "$target" in 
       MKSHLIB_FORCE_ALL='-z allextract'

       MKSHLIB_UNFORCE_ALL=''

       DSO_LDOPTS='-G -h $(@:$(OBJDIR)/%.$(DLL_SUFFIX)=%.$(DLL_SUFFIX))'

       AR='$(CXX) -xar -o $@'

       AS='/usr/ccs/bin/as'

       AS_DASH_C_FLAG=''
@@ -761,6 +763,10 @@ then 
	case "$target" in

	    *-*-solaris*) 

    			AC_DEFINE(_REENTRANT) 

			if test ! "$GNU_CC"; then

				CFLAGS="$CFLAGS -mt" 

				CXXFLAGS="$CXXFLAGS -mt" 

			fi

			;;



	    *-*-linux*)
@@ -769,17 +775,11 @@ then 


	    alpha*-*-osf*)

			AC_DEFINE(_REENTRANT)

dnl			if test ! "$GNU_CC"; then

dnl				CFLAGS="$CFLAGS -pthread" 

dnl				CXXFLAGS="$CXXFLAGS -pthread" 

dnl			fi

			;;



	    *-*-freebsd*)

			AC_DEFINE(_REENTRANT)

			AC_DEFINE(_THREAD_SAFE)

dnl			CFLAGS="$CFLAGS -pthread"

dnl			CXXFLAGS="$CXXFLAGS -pthread"

			dnl -pthread links in -lc_r, so don't specify it explicitly.

			if test "$ac_cv_have_dash_pthread" = "yes"; then

				PTHREAD_LDFLAGS=""
@@ -1427,6 +1427,7 @@ MOZ_ARG_DISABLE_BOOL(static, 
  NO_STATIC_LIB=1)





AC_SUBST(AR)

AC_SUBST(AS)

AC_SUBST(ASFLAGS)

AC_SUBST(AS_DASH_C_FLAG)