[csw-devel] SF.net SVN: gar:[15379] csw/mgar/pkg/gcc4/branches/bootstrap-4.6/Makefile

[wahwah at users.sourceforge.net]

Revision: 15379
          http://gar.svn.sourceforge.net/gar/?rev=15379&view=rev
Author:   wahwah
Date:     2011-08-19 08:32:03 +0000 (Fri, 19 Aug 2011)

Log Message:
-----------
pkg/gcc4/branches/bootstrap-4.6: a conflict with CSWbinutils

Modified Paths:
--------------
    csw/mgar/pkg/gcc4/branches/bootstrap-4.6/Makefile

Modified: csw/mgar/pkg/gcc4/branches/bootstrap-4.6/Makefile
===================================================================
--- csw/mgar/pkg/gcc4/branches/bootstrap-4.6/Makefile	2011-08-19 08:18:38 UTC (rev 15378)
+++ csw/mgar/pkg/gcc4/branches/bootstrap-4.6/Makefile	2011-08-19 08:32:03 UTC (rev 15379)
@@ -174,6 +174,9 @@
 CHECKPKG_OVERRIDES_CSWgcc4objc += file-collision|/opt/csw/lib/sparcv9/libobjc.so|CSWgcc3objcrt|CSWgcc4objc
 CHECKPKG_OVERRIDES_CSWgcc4core += file-collision|/opt/csw/lib/lib-gnu-awt-xlib.so|CSWgcc3javart|CSWgcc4core
 
+# CSWbinutils could be rebuilt
+CHECKPKG_OVERRIDES_CSWgcc4core += file-collision|/opt/csw/lib/libiberty.a|CSWbinutils|CSWgcc4core
+
 # Some static libraries are required to build binaries with gcc, for example
 # libgcc.a and libgcc_eh.a. Otherwise: ld: fatal: library -lgcc: not found
 MERGE_EXCLUDE_LIBTOOL =


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.