[csw-devel] SF.net SVN: gar:[2531] csw/mgar/gar/v2/gar.conf.mk

[dmichelsen at users.sourceforge.net]

Revision: 2531
          http://gar.svn.sourceforge.net/gar/?rev=2531&view=rev
Author:   dmichelsen
Date:     2008-12-11 13:03:11 +0000 (Thu, 11 Dec 2008)

Log Message:
-----------
mGAR v2: Runpath now optional with NORUNPATH=1

Modified Paths:
--------------
    csw/mgar/gar/v2/gar.conf.mk

Modified: csw/mgar/gar/v2/gar.conf.mk
===================================================================
--- csw/mgar/gar/v2/gar.conf.mk	2008-12-11 11:54:08 UTC (rev 2530)
+++ csw/mgar/gar/v2/gar.conf.mk	2008-12-11 13:03:11 UTC (rev 2531)
@@ -413,9 +413,13 @@
 # however not expanded during compilation, so linker-pathes must directly be accessible
 # without expansion and needs to be differentiated between 32 and 64 bit, therefore
 # the links 32 and 64.
+ifndef NORUNPATH
+_ADD_RUNPATH = 1
+endif
+
 ifeq ($(origin LINKER_FLAGS), undefined)
 ifdef NOISALIST
-LINKER_FLAGS = $(foreach ELIB,$(libdir_install) $(EXTRA_LIB),-L$(abspath $(ELIB)/$(MM_LIBDIR)) -R$(abspath $(ELIB)/$(MM_LIBDIR)))
+LINKER_FLAGS = $(foreach ELIB,$(libdir_install) $(EXTRA_LIB),-L$(abspath $(ELIB)/$(MM_LIBDIR))$(if $(_ADD_RUNPATH), -R$(abspath $(ELIB)/$(MM_LIBDIR))))
 else
 # If we use $ISALIST it is a good idea to also add $MM_LIBDIR as there
 # may not be a subdirectory for the 32-bit standard case (this would normally
@@ -424,9 +428,15 @@
 # The quoting of $ISALIST is unfortunately dependend on how often the linker flags
 # are expanded until execution. The definition here is suitable for autotools.
 # For other buildtools it may be suitable to add definitions with other quotings.
-LINKER_FLAGS = $(foreach ELIB,$(libdir_install) $(EXTRA_LIB),-L$(abspath $(ELIB)/$(MM_LIBDIR)) -R$(ELIB)/\\\\\\\$$\$$ISALIST -R$(abspath $(ELIB)/$(MM_LIBDIR)))
+RUNPATHQUOTE ?= 2
+ifeq ($(RUNPATHQUOTE),1)
+  _Q = \\\$$\$$
+else
+  _Q = \\\\\\\$$\$$
 endif
+LINKER_FLAGS = $(foreach ELIB,$(libdir_install) $(EXTRA_LIB),-L$(abspath $(ELIB)/$(MM_LIBDIR))$(if $(_ADD_RUNPATH),  -R$(ELIB)/$(_Q)ISALIST -R$(abspath $(ELIB)/$(MM_LIBDIR))))
 endif
+endif
 
 CC_HOME  = $($(GARCOMPILER)_CC_HOME)
 CC       = $($(GARCOMPILER)_CC)


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