From cacaa7f28b18cafc0fbff970ab377294c8b45672 Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
Date: Sun, 26 Dec 2004 09:00:59 +0000
Subject: Peter S. Mazinger: make sure the ld RELRO and NOW options are
 independent options

---
 libpthread/Makefile | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

(limited to 'libpthread')

diff --git a/libpthread/Makefile b/libpthread/Makefile
index 37985e7ed..9d701c8d8 100644
--- a/libpthread/Makefile
+++ b/libpthread/Makefile
@@ -34,18 +34,24 @@ DIRS=
 ifeq ($(strip $(UCLIBC_HAS_THREADS)),y)
 	DIRS+=linuxthreads
 	LDFLAGS_THREAD:= $(CPU_LDFLAGS-y) -shared --warn-common --warn-once -z combreloc -z defs
-ifeq ($(strip $(PTHREADS_DEBUG_SUPPORT)),y)
-	DIRS+=linuxthreads_db
-	LDFLAGS_THREAD_DB:= $(CPU_LDFLAGS-y) -shared --warn-common --warn-once -z combreloc
 ifeq ($(UCLIBC_BUILD_RELRO),y)
 	LDFLAGS_THREAD+=-z relro
 endif
 ifeq ($(UCLIBC_BUILD_NOW),y)
 	LDFLAGS_THREAD+=-z now
 endif
+ifeq ($(strip $(PTHREADS_DEBUG_SUPPORT)),y)
+	DIRS+=linuxthreads_db
+	LDFLAGS_THREAD_DB:= $(CPU_LDFLAGS-y) -shared --warn-common --warn-once -z combreloc
 endif
 ifeq ($(DODEBUG),n)
 	LDFLAGS_THREAD_DB+=-s
+ifeq ($(UCLIBC_BUILD_RELRO),y)
+       LDFLAGS_THREAD_DB+=-z relro
+endif
+ifeq ($(UCLIBC_BUILD_NOW),y)
+       LDFLAGS_THREAD_DB+=-z now
+endif
 endif
 endif
 
-- 
cgit v1.2.3