[csw-devel] SF.net SVN: gar:[15573] csw/mgar/pkg/gcc4/branches/opt-csw-prefix/Makefile

[wahwah at users.sourceforge.net]

Revision: 15573
          http://gar.svn.sourceforge.net/gar/?rev=15573&view=rev
Author:   wahwah
Date:     2011-09-08 16:28:40 +0000 (Thu, 08 Sep 2011)
Log Message:
-----------
pkg/gcc4/branches/opt-csw-prefix: setting LD_OPTIONS to fix the RPATH problem

Modified Paths:
--------------
    csw/mgar/pkg/gcc4/branches/opt-csw-prefix/Makefile

Modified: csw/mgar/pkg/gcc4/branches/opt-csw-prefix/Makefile
===================================================================
--- csw/mgar/pkg/gcc4/branches/opt-csw-prefix/Makefile	2011-09-08 16:06:39 UTC (rev 15572)
+++ csw/mgar/pkg/gcc4/branches/opt-csw-prefix/Makefile	2011-09-08 16:28:40 UTC (rev 15573)
@@ -109,18 +109,13 @@
 EXTRA_EXPORTS += CFLAGS_FOR_TARGET
 EXTRA_EXPORTS += CXXFLAGS_FOR_TARGET
 
-# The theory goes that the CFLAGS and others cause problems with the multilib
-# builds where 64-bit binaries are built.  This is triggered by the gcc build;
-# the compiler binaries are 32-bit only, but since the compiler can generate
-# 32-bit and 64-bit binaries, the libraries have to be built for both
+# The theory goes that the CFLAGS and CXXFLAGS cause problems with the
+# multilib builds where 64-bit binaries are built.  This is triggered by the
+# gcc build; the compiler binaries are 32-bit only, but since the compiler can
+# generate 32-bit and 64-bit binaries, the libraries have to be built for both
 # architectures.
-# ifeq ($(MODULATION),isa-i386)
 CFLAGS =
 CXXFLAGS =
-FFLAGS =
-FCFLAGS =
-OPTFLAGS =
-# endif
 
 # Might be necessary, but CFLAGS_FOR_TARGET seem to be enough for now.
 # BOOT_CFLAGS = $(CFLAGS_FOR_TARGET)
@@ -500,3 +495,6 @@
 
 # We need GNU find as find
 PATH := /opt/csw/gnu:$(PATH)
+
+# This override sets the right RPATH on libstdc++ and other libraries.
+LD_OPTIONS := -R/opt/csw/lib -R/opt/csw/lib/\$$ISALIST

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