From aa498be17426e065e165698bbc0c1cd07e5f0ef1 Mon Sep 17 00:00:00 2001 From: Norbert Thiebaud Date: Mon, 20 Dec 2010 07:35:50 -0600 Subject: [PATCH] fixing rpath quoting voodoo on solaris --- solenv/gbuild/platform/solaris.mk | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/solenv/gbuild/platform/solaris.mk b/solenv/gbuild/platform/solaris.mk index bb9341921a86..bffc74183881 100755 --- a/solenv/gbuild/platform/solaris.mk +++ b/solenv/gbuild/platform/solaris.mk @@ -160,16 +160,16 @@ define gb_LinkTarget__get_rpath_for_layer $(patsubst $(1):%,%,$(filter $(1):%,$(gb_LinkTarget__RPATHS))) endef define gb_LinkTarget_get_rpath --R\'$(call gb_LinkTarget__get_rpath_for_layer,$(call gb_LinkTarget_get_layer,$(2)))\' +'-R$(call gb_LinkTarget__get_rpath_for_layer,$(call gb_LinkTarget_get_layer,$(2)))' endef gb_LinkTarget__RPATHS := \ - URELIB:'$$$$ORIGIN' \ - UREBIN:'$$$$ORIGIN/../lib:$$$$ORIGIN' \ - OOOLIB:'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' \ - BRAND:'$$$$ORIGIN:$$$$ORIGIN/../basis-link/program:$$$$ORIGIN/../basis-link/ure-link/lib' \ - SDKBIN:'$$$$ORIGIN/../../ure-link/lib' \ - NONEBIN:'$$$$ORIGIN/../lib:$$$$ORIGIN' \ + URELIB:$$$$ORIGIN \ + UREBIN:$$$$ORIGIN/../lib:$$$$ORIGIN \ + OOOLIB:$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib \ + BRAND:$$$$ORIGIN:$$$$ORIGIN/../basis-link/program:$$$$ORIGIN/../basis-link/ure-link/lib \ + SDKBIN:$$$$ORIGIN/../../ure-link/lib \ + NONEBIN:$$$$ORIGIN/../lib:$$$$ORIGIN \ gb_LinkTarget_LAYER := \ $(foreach lib,$(gb_Library_OOOLIBS),$(lib):OOOLIB) \