summaryrefslogtreecommitdiff
path: root/nss
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2012-08-30 08:29:18 +0200
committerStephan Bergmann <sbergman@redhat.com>2012-08-30 08:29:18 +0200
commitb888512fcbff5bf5ae4d30e82ed51a792ceb1839 (patch)
tree9a249b7f9e90357e9ae220ce6bb46d2230d53db3 /nss
parentbeab021ffe57cf6004971d4f285984b6debe5b5f (diff)
Fix -Wl,-z,origin -Wl,-rpath,... quoting
Change-Id: I65eac6ab34d2d54eeaa2bc14838711f700d0d535
Diffstat (limited to 'nss')
-rw-r--r--nss/nss.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/nss/nss.patch b/nss/nss.patch
index 19ee7c5e803b..5d6730266689 100644
--- a/nss/nss.patch
+++ b/nss/nss.patch
@@ -32,7 +32,7 @@
DSO_CFLAGS = -fPIC
DSO_LDOPTS = -shared -Wl,-soname -Wl,$(notdir $@)
-+DSO_LDOPTS += '-Wl,-z,origin -Wl,-rpath,$$ORIGIN'
++DSO_LDOPTS += -Wl,-z,origin '-Wl,-rpath,$$ORIGIN'
#
# The default implementation strategy for FreeBSD is pthreads.
@@ -57,7 +57,7 @@
# we don't use -z defs there.
ZDEFS_FLAG = -Wl,-z,defs
-DSO_LDOPTS += $(if $(findstring 2.11.90.0.8,$(shell ld -v)),,$(ZDEFS_FLAG))
-+DSO_LDOPTS += $(if $(findstring 2.11.90.0.8,$(shell ld -v)),,$(ZDEFS_FLAG)) '-Wl,-z,origin -Wl,-rpath,$$ORIGIN'
++DSO_LDOPTS += $(if $(findstring 2.11.90.0.8,$(shell ld -v)),,$(ZDEFS_FLAG)) -Wl,-z,origin '-Wl,-rpath,$$ORIGIN'
LDFLAGS += $(ARCHFLAG)
# INCLUDES += -I/usr/include -Y/usr/include/linux