SPECS (AC-branch): gcc.spec - don't force unconditional multilib o...

[baggins]

Author: baggins                      Date: Fri Aug 19 15:40:18 2005 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- don't force unconditional multilib on amd64

---- Files affected:
SPECS:
   gcc.spec (1.241.2.20 -> 1.241.2.21) 

---- Diffs:

================================================================
Index: SPECS/gcc.spec
diff -u SPECS/gcc.spec:1.241.2.20 SPECS/gcc.spec:1.241.2.21
--- SPECS/gcc.spec:1.241.2.20	Fri Aug 19 13:24:09 2005
+++ SPECS/gcc.spec	Fri Aug 19 17:40:12 2005
@@ -5,14 +5,15 @@
 %bcond_without	java		# build without Java support
 %bcond_without	objc		# build without objc support
 %bcond_with	bootstrap	# don't BR gcc(ada) (temporary for Ac upgrade bootstrap)
+%ifarch amd64
+%bcond_without	multilib	# build without multilib support
+%else
 %bcond_with	multilib	# build with multilib support
+%endif
 #
 %ifnarch amd64 ppc64 s390x sparc64
 %undefine	with_multilib
 %endif
-%ifarch amd64
-%define		with_multilib	1
-%endif
 #
 %define		DASHED_SNAP	%{nil}
 %define		SNAP		%(echo %{DASHED_SNAP} | sed -e "s#-##g")
@@ -1850,6 +1851,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.241.2.21  2005/08/19 15:40:12  baggins
+- don't force unconditional multilib on amd64
+
 Revision 1.241.2.20  2005/08/19 11:24:09  baggins
 - release 3
 - multilib on for amd64
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/gcc.spec?r1=1.241.2.20&r2=1.241.2.21&f=u