stdcxx-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From abl...@apache.org
Subject svn commit: r485773 - in /incubator/stdcxx/trunk: ./ etc/config/
Date Mon, 11 Dec 2006 17:49:15 GMT
Author: ablack
Date: Mon Dec 11 09:49:14 2006
New Revision: 485773

URL: http://svn.apache.org/viewvc?view=rev&rev=485773
Log:
2006-12-08  Andrew Black  <ablack@roguewave.com>

	* GNUmakefile ($(MAKEFILE_IN)): Echo RPATH into generated makefile.in
	* GNUmakefile.bin (LDFLAGS): Add $(RPATH) switch with a value of 
	$(LIBDIR) to $(LDFLAGS) if $(RPATH) is defined.
	* GNUmakefile.exm (LDFLAGS): Ditto.
	* GNUmakefile.ph (LDFLAGS): Ditto.
	* GNUmakefile.rwt (LDFLAGS): Ditto.
	* GNUmakefile.tst (LDFLAGS): Add $(RPATH) switch with a value of 
	$(LIBDIR):$(BUILDDIR)/rwtest to $(LDFLAGS) if $(RPATH) is defined.
	* acc.config (SHARED_LDFLAGS): Move rpath flag definition from here ...
	(RPATH): ... To here.
	* gcc.config (SHARED_LDFLAGS, RPATH): Ditto.
	* icc.config (SHARED_LDFLAGS, RPATH): Ditto.
	* sunpro.config (SHARED_LDFLAGS, RPATH): Ditto.
	* mipspro.config (SHARED_LDFLAGS, RPATH): Ditto.
	* osf_cxx.config (SHARED_LDFLAGS, RPATH): Ditto.
	* vacpp.config (SHARED_LDFLAGS, RPATH): Ditto.
	* como.config (RPATH): Define placeholder (empty) flag definition.
	* eccp.config (RPATH): Ditto.
	* reliant_cds.config (RPATH): Ditto.

Modified:
    incubator/stdcxx/trunk/GNUmakefile
    incubator/stdcxx/trunk/etc/config/GNUmakefile.bin
    incubator/stdcxx/trunk/etc/config/GNUmakefile.exm
    incubator/stdcxx/trunk/etc/config/GNUmakefile.ph
    incubator/stdcxx/trunk/etc/config/GNUmakefile.rwt
    incubator/stdcxx/trunk/etc/config/GNUmakefile.tst
    incubator/stdcxx/trunk/etc/config/acc.config
    incubator/stdcxx/trunk/etc/config/como.config
    incubator/stdcxx/trunk/etc/config/eccp.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/reliant_cds.config
    incubator/stdcxx/trunk/etc/config/sunpro.config
    incubator/stdcxx/trunk/etc/config/vacpp.config

Modified: incubator/stdcxx/trunk/GNUmakefile
URL: http://svn.apache.org/viewvc/incubator/stdcxx/trunk/GNUmakefile?view=diff&rev=485773&r1=485772&r2=485773
==============================================================================
--- incubator/stdcxx/trunk/GNUmakefile (original)
+++ incubator/stdcxx/trunk/GNUmakefile Mon Dec 11 09:49:14 2006
@@ -589,6 +589,7 @@
           && echo "LDLIBS     = $(LDLIBS)"               >> $(MAKEFILE_IN)
 \
           && echo "LDSOFLAGS  = $(LDSOFLAGS)"            >> $(MAKEFILE_IN)
 \
           && echo "MAPFLAGS   = $(MAPFLAGS)"             >> $(MAKEFILE_IN)
 \
+          && echo "RPATH      = $(RPATH)"                >> $(MAKEFILE_IN)
 \
           && [ "$(MAPFILE)" = "" ]                                          \
           || echo "MAPFILE    = $$""(TOPDIR)/$(MAPFILE)" >> $(MAKEFILE_IN)  \
           && echo "RUNFLAGS   = -t 180"                  >> $(MAKEFILE_IN)
 \

Modified: incubator/stdcxx/trunk/etc/config/GNUmakefile.bin
URL: http://svn.apache.org/viewvc/incubator/stdcxx/trunk/etc/config/GNUmakefile.bin?view=diff&rev=485773&r1=485772&r2=485773
==============================================================================
--- incubator/stdcxx/trunk/etc/config/GNUmakefile.bin (original)
+++ incubator/stdcxx/trunk/etc/config/GNUmakefile.bin Mon Dec 11 09:49:14 2006
@@ -48,6 +48,10 @@
 # Don't want to link exec utility with stdlib, so create our own LDFLAGS var
 LDFLAGS.exec = $(filter-out -l$(LIBBASE),$(LDFLAGS))
 
+ifneq ($(RPATH),)
+  LDFLAGS += $(RPATH)$(LIBDIR)
+endif
+
 ##############################################################################
 #  TARGETS
 ##############################################################################

Modified: incubator/stdcxx/trunk/etc/config/GNUmakefile.exm
URL: http://svn.apache.org/viewvc/incubator/stdcxx/trunk/etc/config/GNUmakefile.exm?view=diff&rev=485773&r1=485772&r2=485773
==============================================================================
--- incubator/stdcxx/trunk/etc/config/GNUmakefile.exm (original)
+++ incubator/stdcxx/trunk/etc/config/GNUmakefile.exm Mon Dec 11 09:49:14 2006
@@ -23,6 +23,10 @@
 
 RUNFLAGS += -d $(EXMDIR)
 
+ifneq ($(RPATH),)
+  LDFLAGS += $(RPATH)$(LIBDIR)
+endif
+
 ##############################################################################
 #  TARGETS
 ##############################################################################

Modified: incubator/stdcxx/trunk/etc/config/GNUmakefile.ph
URL: http://svn.apache.org/viewvc/incubator/stdcxx/trunk/etc/config/GNUmakefile.ph?view=diff&rev=485773&r1=485772&r2=485773
==============================================================================
--- incubator/stdcxx/trunk/etc/config/GNUmakefile.ph (original)
+++ incubator/stdcxx/trunk/etc/config/GNUmakefile.ph Mon Dec 11 09:49:14 2006
@@ -47,6 +47,10 @@
 # override the runtarget set in makefile.common
 RUNTARGET   = $(shell $(MAKE) -s listtarget listsubtests | sed "s/ / .\//g")
 
+ifneq ($(RPATH),)
+  LDFLAGS += $(RPATH)$(LIBDIR)
+endif
+
 ##############################################################################
 #  TARGETS  
 ##############################################################################

Modified: incubator/stdcxx/trunk/etc/config/GNUmakefile.rwt
URL: http://svn.apache.org/viewvc/incubator/stdcxx/trunk/etc/config/GNUmakefile.rwt?view=diff&rev=485773&r1=485772&r2=485773
==============================================================================
--- incubator/stdcxx/trunk/etc/config/GNUmakefile.rwt (original)
+++ incubator/stdcxx/trunk/etc/config/GNUmakefile.rwt Mon Dec 11 09:49:14 2006
@@ -54,6 +54,10 @@
 CXXPRELINK = $(CXX) $(CPPFLAGS) $(PRELINKFLAGS) $(OBJS) $(LDFLAGS)
 endif   # ($(PRELINKFLAGS),)
 
+ifneq ($(RPATH),)
+  LDFLAGS += $(RPATH)$(LIBDIR)
+endif
+
 ##############################################################################
 #  TARGETS
 ##############################################################################

Modified: incubator/stdcxx/trunk/etc/config/GNUmakefile.tst
URL: http://svn.apache.org/viewvc/incubator/stdcxx/trunk/etc/config/GNUmakefile.tst?view=diff&rev=485773&r1=485772&r2=485773
==============================================================================
--- incubator/stdcxx/trunk/etc/config/GNUmakefile.tst (original)
+++ incubator/stdcxx/trunk/etc/config/GNUmakefile.tst Mon Dec 11 09:49:14 2006
@@ -67,6 +67,10 @@
 # add to targets objects for any sources in the current working directory
 TARGET += $(patsubst %.cpp,%.o,$(wildcard *.cpp))
 
+ifneq ($(RPATH),)
+  LDFLAGS += $(RPATH)$(LIBDIR):$(BUILDDIR)/rwtest
+endif
+
 ##############################################################################
 #  TARGETS
 ##############################################################################

Modified: incubator/stdcxx/trunk/etc/config/acc.config
URL: http://svn.apache.org/viewvc/incubator/stdcxx/trunk/etc/config/acc.config?view=diff&rev=485773&r1=485772&r2=485773
==============================================================================
--- incubator/stdcxx/trunk/etc/config/acc.config (original)
+++ incubator/stdcxx/trunk/etc/config/acc.config Mon Dec 11 09:49:14 2006
@@ -68,6 +68,8 @@
 LDFLAGS         = -Aa +nostl -Wl,+s -Wl,+vnocompatwarnings "$$"(_LDOPTS)
 endif
 
+# The flag(s) to use to embed a library search path into generated executables.
+RPATH = -Wl,+b
 
 # debug/optimization options
 DEBUG_CXXFLAGS  = -g +d
@@ -79,7 +81,7 @@
 # shared/static library options
 SHARED_CXXFLAGS =
 SHARED_CPPFLAGS =
-SHARED_LDFLAGS  = -Wl,+b$(LIBDIR)
+SHARED_LDFLAGS  =
 SHARED_SUFFIX   = .sl
 
 STATIC_CXXFLAGS =

Modified: incubator/stdcxx/trunk/etc/config/como.config
URL: http://svn.apache.org/viewvc/incubator/stdcxx/trunk/etc/config/como.config?view=diff&rev=485773&r1=485772&r2=485773
==============================================================================
--- incubator/stdcxx/trunk/etc/config/como.config (original)
+++ incubator/stdcxx/trunk/etc/config/como.config Mon Dec 11 09:49:14 2006
@@ -25,6 +25,9 @@
 PICFLAGS        = 
 PRELINKFLAGS    = --prelink_objects
 
+# The flag(s) to use to embed a library search path into generated executables.
+# Appropriate flag(s) (if available) not determined at this time.
+RPATH =
 
 # debug/optimization options
 DEBUG_CXXFLAGS  = -g

Modified: incubator/stdcxx/trunk/etc/config/eccp.config
URL: http://svn.apache.org/viewvc/incubator/stdcxx/trunk/etc/config/eccp.config?view=diff&rev=485773&r1=485772&r2=485773
==============================================================================
--- incubator/stdcxx/trunk/etc/config/eccp.config (original)
+++ incubator/stdcxx/trunk/etc/config/eccp.config Mon Dec 11 09:49:14 2006
@@ -47,6 +47,10 @@
 # to assemble such files)
 AS_EXT = .
 
+# The flag(s) to use to embed a library search path into generated executables.
+# Appropriate flag(s) (if available) not determined at this time.
+RPATH =
+
 # debug/optimization options
 DEBUG_CXXFLAGS  = -g
 DEBUG_CPPFLAGS  =

Modified: incubator/stdcxx/trunk/etc/config/gcc.config
URL: http://svn.apache.org/viewvc/incubator/stdcxx/trunk/etc/config/gcc.config?view=diff&rev=485773&r1=485772&r2=485773
==============================================================================
--- incubator/stdcxx/trunk/etc/config/gcc.config (original)
+++ incubator/stdcxx/trunk/etc/config/gcc.config Mon Dec 11 09:49:14 2006
@@ -128,45 +128,46 @@
   endif
 endif   # gcc > 2
 
-# debug/optimization options
-DEBUG_CXXFLAGS  = -g
-DEBUG_CPPFLAGS  =
-
-OPTMZ_CXXFLAGS  = -O2
-OPTMZ_CPPFLAGS  =
-
-# shared/static library options
-SHARED_CXXFLAGS = 
-SHARED_CPPFLAGS =
+# The flag(s) to use to embed a library search path into generated executables.
 ifeq ($(OSNAME),Linux)
-  SHARED_LDFLAGS = -Wl,-R$(LIBDIR)
+  RPATH = -Wl,-R
 else
   ifeq ($(OSNAME),SunOS)
-    SHARED_LDFLAGS = -Wl,-R$(LIBDIR)
+    RPATH = -Wl,-R
   else
     ifeq ($(OSNAME),AIX)
       ifeq ($(shell [ $(OS_MAJOR) -gt 5 -o $(OS_MAJOR) -eq 5 -a $(OS_MINOR) \
 -ge 3 ] && echo 1), 1)
         # -bsrv4, -R only available on AIX 5.3 and newer
-        SHARED_LDFLAGS  = -Wl,-bsvr4,-R$(LIBDIR)
+        RPATH = -Wl,-bsvr4,-R
       endif
     else
       ifeq ($(OSNAME),HP-UX)
-        SHARED_LDFLAGS = -Wl,+b$(LIBDIR)
+        RPATH = -Wl,+b
       else
         ifeq ($(OSNAME),IRIX64)
-          SHARED_LDFLAGS = -Wl,-rpath,$(LIBDIR)
+          RPATH = -Wl,-rpath,
         else
           ifeq ($(OSNAME),OSF1)
-            SHARED_LDFLAGS = -Wl,-rpath,$(LIBDIR)
-          else
-            SHARED_LDFLAGS =
+            RPATH = -Wl,-rpath,
           endif
         endif
       endif
     endif
   endif
 endif
+
+# debug/optimization options
+DEBUG_CXXFLAGS  = -g
+DEBUG_CPPFLAGS  =
+
+OPTMZ_CXXFLAGS  = -O2
+OPTMZ_CPPFLAGS  =
+
+# shared/static library options
+SHARED_CXXFLAGS = 
+SHARED_CPPFLAGS =
+SHARED_LDFLAGS =
 
 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=485773&r1=485772&r2=485773
==============================================================================
--- incubator/stdcxx/trunk/etc/config/icc.config (original)
+++ incubator/stdcxx/trunk/etc/config/icc.config Mon Dec 11 09:49:14 2006
@@ -31,6 +31,8 @@
 LDSOFLAGS       = -shared
 LDLIBS          = -Bstatic -lcxa -lunwind -Bdynamic $(ICCDIR)/crtxn.o
 
+# The flag(s) to use to embed a library search path into generated executables.
+RPATH           = -Wl,-R
 
 # debug/optimization options
 DEBUG_CXXFLAGS  = -g
@@ -42,7 +44,7 @@
 # shared/archive library options
 SHARED_CXXFLAGS =
 SHARED_CPPFLAGS =
-SHARED_LDFLAGS  = -Wl,-R$(LIBDIR)
+SHARED_LDFLAGS  = 
 
 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=485773&r1=485772&r2=485773
==============================================================================
--- incubator/stdcxx/trunk/etc/config/mipspro.config (original)
+++ incubator/stdcxx/trunk/etc/config/mipspro.config Mon Dec 11 09:49:14 2006
@@ -36,6 +36,9 @@
 # the extension of assembly files is .s
 AS_EXT = .s
 
+# The flag(s) to use to embed a library search path into generated executables.
+RPATH = -Wl,-rpath,
+
 # debug/optimization options
 DEBUG_CXXFLAGS  = -g
 DEBUG_CPPFLAGS  =
@@ -47,7 +50,7 @@
 # shared/static library options
 SHARED_CXXFLAGS =
 SHARED_CPPFLAGS =
-SHARED_LDFLAGS  = -Wl,-rpath,$(LIBDIR)
+SHARED_LDFLAGS  = 
 
 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=485773&r1=485772&r2=485773
==============================================================================
--- incubator/stdcxx/trunk/etc/config/osf_cxx.config (original)
+++ incubator/stdcxx/trunk/etc/config/osf_cxx.config Mon Dec 11 09:49:14 2006
@@ -25,6 +25,9 @@
 # (makefiles will append '=' followed by the name of the repository)
 CXX_REPOSITORY  = -ptr
 
+# The flag(s) to use to embed a library search path into generated executables.
+RPATH = -rpath 
+
 # debug/optimization options
 DEBUG_CXXFLAGS  = -g
 DEBUG_CPPFLAGS  =
@@ -35,7 +38,7 @@
 # shared/static library option
 SHARED_CXXFLAGS = 
 SHARED_CPPFLAGS = -D_RWSTD_SHARED_LIB
-SHARED_LDFLAGS  = -rpath $(LIBDIR)
+SHARED_LDFLAGS  = 
 
 STATIC_CXXFLAGS =
 STATIC_CPPFLAGS =

Modified: incubator/stdcxx/trunk/etc/config/reliant_cds.config
URL: http://svn.apache.org/viewvc/incubator/stdcxx/trunk/etc/config/reliant_cds.config?view=diff&rev=485773&r1=485772&r2=485773
==============================================================================
--- incubator/stdcxx/trunk/etc/config/reliant_cds.config (original)
+++ incubator/stdcxx/trunk/etc/config/reliant_cds.config Mon Dec 11 09:49:14 2006
@@ -15,6 +15,9 @@
 CPPFLAGS        =
 LDFLAGS         =
 
+# The flag(s) to use to embed a library search path into generated executables.
+# Appropriate flag(s) (if available) not determined at this time.
+RPATH =
 
 # debug/optimization options
 DEBUG_CXXFLAGS  = -g

Modified: incubator/stdcxx/trunk/etc/config/sunpro.config
URL: http://svn.apache.org/viewvc/incubator/stdcxx/trunk/etc/config/sunpro.config?view=diff&rev=485773&r1=485772&r2=485773
==============================================================================
--- incubator/stdcxx/trunk/etc/config/sunpro.config (original)
+++ incubator/stdcxx/trunk/etc/config/sunpro.config Mon Dec 11 09:49:14 2006
@@ -25,6 +25,9 @@
 AR              = CC
 ARFLAGS         = -xar -o
 
+# The flag(s) to use to embed a library search path into generated executables.
+RPATH = -R
+
 # debug/optimization options
 DEBUG_CXXFLAGS  = -g
 DEBUG_CPPFLAGS  =
@@ -35,7 +38,7 @@
 # shared/static library options
 SHARED_CXXFLAGS =
 SHARED_CPPFLAGS =
-SHARED_LDFLAGS  = -R$(LIBDIR)
+SHARED_LDFLAGS  = 
 
 STATIC_CXXFLAGS =
 STATIC_CPPFLAGS =

Modified: incubator/stdcxx/trunk/etc/config/vacpp.config
URL: http://svn.apache.org/viewvc/incubator/stdcxx/trunk/etc/config/vacpp.config?view=diff&rev=485773&r1=485772&r2=485773
==============================================================================
--- incubator/stdcxx/trunk/etc/config/vacpp.config (original)
+++ incubator/stdcxx/trunk/etc/config/vacpp.config Mon Dec 11 09:49:14 2006
@@ -107,6 +107,17 @@
   LDSOFLAGS     = -G
 endif
 
+# The flag(s) to use to embed a library search path into generated executables.
+ifeq ($(OSNAME),AIX)
+  ifeq ($(shell [ $(OS_MAJOR) -gt 5 -o $(OS_MAJOR) -eq 5 -a $(OS_MINOR) -ge 3 \
+] && echo 1), 1)
+    # -bsrv4, -R only available on AIX 5.3 and newer
+    RPATH = -Wl,-bsvr4,-R
+  endif
+else   # assume Linux
+   RPATH = -Wl,-R
+endif
+
 # debug/optimization options
 DEBUG_CXXFLAGS  = -g
 DEBUG_CPPFLAGS  =
@@ -117,15 +128,7 @@
 # shared/archive library options
 SHARED_CXXFLAGS = 
 SHARED_CPPFLAGS =
-ifeq ($(OSNAME),AIX)
-  ifeq ($(shell [ $(OS_MAJOR) -gt 5 -o $(OS_MAJOR) -eq 5 -a $(OS_MINOR) -ge 3 \
-] && echo 1), 1)
-    # -bsrv4, -R only available on AIX 5.3 and newer
-    SHARED_LDFLAGS  = -Wl,-bsvr4,-R$(LIBDIR)
-  endif
-else   # assume Linux
-  SHARED_LDFLAGS  = -Wl,-R$(LIBDIR)
-endif
+SHARED_LDFLAGS  =
 
 ifeq ($(rtl_enabled),1)
   SHARED_SUFFIX = .so



Mime
View raw message