stdcxx-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From abl...@apache.org
Subject svn commit: r480202 - in /incubator/stdcxx/trunk/etc/config: acc.config gcc.config icc.config mipspro.config osf_cxx.config sunpro.config vacpp.config
Date Tue, 28 Nov 2006 20:50:45 GMT
Author: ablack
Date: Tue Nov 28 12:50:44 2006
New Revision: 480202

URL: http://svn.apache.org/viewvc?view=rev&rev=480202
Log:
2006-11-28  Andrew Black  <ablack@roguewave.com>
	* sunpro.config (LDFLAGS): Remove redundant -L$(LIBDIR) switch.  Switch is added if needed
in makefile.common.
	(MULTI_LDFLAGS_POSIX, MULTI_LDFLAGS_SOLARIS): Use $(LIBPTHREAD) for MULTI_LDFLAGS_POSIX and
$(LIBTHREAD) for MULTI_LDFLAGS_SOLARIS.  Had been reversed at some point by mistake.
	* acc.config (LDFLAGS): Remove redundant -L$(LIBDIR) switch.  Switch is added if needed in
makefile.common.
	(SHARED_LDFLAGS): Add rpath switch to include $(LIBDIR) in ld search path of executables.
	* gcc.config (SHARED_LDFLAGS): Ditto.
	* icc.config (SHARED_LDFLAGS): Ditto.
	* mipspro.config (LDFLAGS): Remove redundant -L$(LIBDIR) switch.  Switch is added if needed
in makefile.common.
	(SHARED_LDFLAGS): Add rpath switch to include $(LIBDIR) in ld search path of executables.
	* osf_cxx.config (SHARED_LDFLAGS): Ditto.
	* vacpp.config (SHARED_LDFLAGS): Ditto.

Modified:
    incubator/stdcxx/trunk/etc/config/acc.config
    incubator/stdcxx/trunk/etc/config/gcc.config
    incubator/stdcxx/trunk/etc/config/icc.config
    incubator/stdcxx/trunk/etc/config/mipspro.config
    incubator/stdcxx/trunk/etc/config/osf_cxx.config
    incubator/stdcxx/trunk/etc/config/sunpro.config
    incubator/stdcxx/trunk/etc/config/vacpp.config

Modified: incubator/stdcxx/trunk/etc/config/acc.config
URL: http://svn.apache.org/viewvc/incubator/stdcxx/trunk/etc/config/acc.config?view=diff&rev=480202&r1=480201&r2=480202
==============================================================================
--- incubator/stdcxx/trunk/etc/config/acc.config (original)
+++ incubator/stdcxx/trunk/etc/config/acc.config Tue Nov 28 12:50:44 2006
@@ -58,14 +58,14 @@
 CXXFLAGS        = -AA "$$"(_CXXOPTS)
 CXXPRELINK      = 
 CPPFLAGS        = "$$"(_CPPOPTS)
-LDFLAGS         = -AA +nostl -Wl,+s -L$(LIBDIR) "$$"(_LDOPTS)
+LDFLAGS         = -AA +nostl -Wl,+s "$$"(_LDOPTS)
 else
 CXXFLAGS        = -Aa +nostl "$$"(_CXXOPTS)
 CXXPRELINK      = 
 CPPFLAGS        = -I$(TOPDIR)/include/ansi -I/usr/include "$$"(_CPPOPTS)
 # -Wl,+s allows the dynamic loader to consider LD_LIBRARY_PATH (LP64)
 # and SHLIB_PATH when loading an executable into memory
-LDFLAGS         = -Aa +nostl -Wl,+s -Wl,+vnocompatwarnings -L$(LIBDIR) "$$"(_LDOPTS)
+LDFLAGS         = -Aa +nostl -Wl,+s -Wl,+vnocompatwarnings "$$"(_LDOPTS)
 endif
 
 
@@ -79,7 +79,7 @@
 # shared/static library options
 SHARED_CXXFLAGS =
 SHARED_CPPFLAGS =
-SHARED_LDFLAGS  =
+SHARED_LDFLAGS  = -Wl,+b$(LIBDIR)
 SHARED_SUFFIX   = .sl
 
 STATIC_CXXFLAGS =

Modified: incubator/stdcxx/trunk/etc/config/gcc.config
URL: http://svn.apache.org/viewvc/incubator/stdcxx/trunk/etc/config/gcc.config?view=diff&rev=480202&r1=480201&r2=480202
==============================================================================
--- incubator/stdcxx/trunk/etc/config/gcc.config (original)
+++ incubator/stdcxx/trunk/etc/config/gcc.config Tue Nov 28 12:50:44 2006
@@ -132,7 +132,31 @@
 # shared/static library options
 SHARED_CXXFLAGS = 
 SHARED_CPPFLAGS =
-SHARED_LDFLAGS  =
+ifeq ($(OSNAME),Linux)
+  SHARED_LDFLAGS = -Wl,-R$(LIBDIR)
+else
+  ifeq ($(OSNAME),SunOS)
+    SHARED_LDFLAGS = -Wl,-R$(LIBDIR)
+  else
+    ifeq ($(OSNAME),AIX)
+      SHARED_LDFLAGS = -Wl,-bsvr4,-R$(LIBDIR)
+    else
+      ifeq ($(OSNAME),HP-UX)
+        SHARED_LDFLAGS = -Wl,+b$(LIBDIR)
+      else
+        ifeq ($(OSNAME),IRIX64)
+          SHARED_LDFLAGS = -Wl,-rpath,$(LIBDIR)
+        else
+          ifeq ($(OSNAME),OSF1)
+            SHARED_LDFLAGS = -Wl,-rpath,$(LIBDIR)
+          else
+            SHARED_LDFLAGS =
+          endif
+        endif
+      endif
+    endif
+  endif
+endif
 
 ifeq ($(OSNAME),AIX)
   SHARED_SUFFIX   = .a

Modified: incubator/stdcxx/trunk/etc/config/icc.config
URL: http://svn.apache.org/viewvc/incubator/stdcxx/trunk/etc/config/icc.config?view=diff&rev=480202&r1=480201&r2=480202
==============================================================================
--- incubator/stdcxx/trunk/etc/config/icc.config (original)
+++ incubator/stdcxx/trunk/etc/config/icc.config Tue Nov 28 12:50:44 2006
@@ -42,7 +42,7 @@
 # shared/archive library options
 SHARED_CXXFLAGS =
 SHARED_CPPFLAGS =
-SHARED_LDFLAGS  =
+SHARED_LDFLAGS  = -Wl,-R$(LIBDIR)
 
 STATIC_CXXFLAGS =
 STATIC_CPPFLAGS =

Modified: incubator/stdcxx/trunk/etc/config/mipspro.config
URL: http://svn.apache.org/viewvc/incubator/stdcxx/trunk/etc/config/mipspro.config?view=diff&rev=480202&r1=480201&r2=480202
==============================================================================
--- incubator/stdcxx/trunk/etc/config/mipspro.config (original)
+++ incubator/stdcxx/trunk/etc/config/mipspro.config Tue Nov 28 12:50:44 2006
@@ -27,7 +27,7 @@
 
 
 # disable warnings about libs that aren't being used to resolve any symbols
-LDFLAGS         = -Wl,-woff,84 -L$(LIBDIR)
+LDFLAGS         = -Wl,-woff,84
 
 # use the undocumented -LANG:std=off option to prevent linking
 # with the native C++ Standard Library
@@ -47,7 +47,7 @@
 # shared/static library options
 SHARED_CXXFLAGS =
 SHARED_CPPFLAGS =
-SHARED_LDFLAGS  =
+SHARED_LDFLAGS  = -Wl,-rpath,$(LIBDIR)
 
 STATIC_CXXFLAGS =
 STATIC_CPPFLAGS =

Modified: incubator/stdcxx/trunk/etc/config/osf_cxx.config
URL: http://svn.apache.org/viewvc/incubator/stdcxx/trunk/etc/config/osf_cxx.config?view=diff&rev=480202&r1=480201&r2=480202
==============================================================================
--- incubator/stdcxx/trunk/etc/config/osf_cxx.config (original)
+++ incubator/stdcxx/trunk/etc/config/osf_cxx.config Tue Nov 28 12:50:44 2006
@@ -35,7 +35,7 @@
 # shared/static library option
 SHARED_CXXFLAGS = 
 SHARED_CPPFLAGS = -D_RWSTD_SHARED_LIB
-SHARED_LDFLAGS  =
+SHARED_LDFLAGS  = -rpath $(LIBDIR)
 
 STATIC_CXXFLAGS =
 STATIC_CPPFLAGS =

Modified: incubator/stdcxx/trunk/etc/config/sunpro.config
URL: http://svn.apache.org/viewvc/incubator/stdcxx/trunk/etc/config/sunpro.config?view=diff&rev=480202&r1=480201&r2=480202
==============================================================================
--- incubator/stdcxx/trunk/etc/config/sunpro.config (original)
+++ incubator/stdcxx/trunk/etc/config/sunpro.config Tue Nov 28 12:50:44 2006
@@ -17,7 +17,7 @@
 CXXFLAGS        = -library=%none
 CXXPRELINK      = 
 CPPFLAGS        =
-LDFLAGS         = -library=%none -L$(LIBDIR)
+LDFLAGS         = -library=%none
 LDSOFLAGS       = -G
 
 # use CC to invoke the compiler (needed to pick up template
@@ -62,8 +62,8 @@
     LIBTHREAD  = -lthread
 endif
 
-MULTI_LDFLAGS_POSIX    = -mt $(LIBTHREAD)
-MULTI_LDFLAGS_SOLARIS  = -mt $(LIBPTHREAD)
+MULTI_LDFLAGS_POSIX    = -mt $(LIBPTHREAD)
+MULTI_LDFLAGS_SOLARIS  = -mt $(LIBTHREAD)
 MULTI_LDFLAGS_DCE      =
 
 # POSIX

Modified: incubator/stdcxx/trunk/etc/config/vacpp.config
URL: http://svn.apache.org/viewvc/incubator/stdcxx/trunk/etc/config/vacpp.config?view=diff&rev=480202&r1=480201&r2=480202
==============================================================================
--- incubator/stdcxx/trunk/etc/config/vacpp.config (original)
+++ incubator/stdcxx/trunk/etc/config/vacpp.config Tue Nov 28 12:50:44 2006
@@ -111,7 +111,7 @@
 # shared/archive library options
 SHARED_CXXFLAGS = 
 SHARED_CPPFLAGS =
-SHARED_LDFLAGS  = 
+SHARED_LDFLAGS  = -Wl,-bsvr4,-R$(LIBDIR)
 
 ifeq ($(rtl_enabled),1)
   SHARED_SUFFIX = .so



Mime
View raw message