From fb970bebb91999db15159f90dc2aa1b94b2a0853 Mon Sep 17 00:00:00 2001
From: pancake <pancake@nopcode.org>
Date: Tue, 27 Jan 2015 17:46:56 +0100
Subject: [PATCH] Honor LDFLAGS in more places (Thanks Gentoo guys for
 noticing)

https://bugs.gentoo.org/show_bug.cgi?id=391751
---
 libr/bp/p/arm.mk           | 2 +-
 libr/bp/p/x86.mk           | 2 +-
 libr/io/p/debug.mk         | 2 +-
 libr/io/p/haret.mk         | 2 +-
 libr/io/p/mach.mk          | 3 ++-
 libr/io/p/malloc.mk        | 3 ++-
 libr/io/p/procpid.mk       | 2 +-
 libr/io/p/ptrace.mk        | 2 +-
 libr/io/p/shm.mk           | 3 ++-
 libr/io/p/w32dbg.mk        | 2 +-
 libr/parse/p/arm_pseudo.mk | 3 ++-
 libr/parse/p/mreplace.mk   | 3 ++-
 libr/parse/p/x86_pseudo.mk | 3 ++-
 13 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/libr/bp/p/arm.mk b/libr/bp/p/arm.mk
index a982b75b98..418420cafa 100644
--- a/libr/bp/p/arm.mk
+++ b/libr/bp/p/arm.mk
@@ -6,4 +6,4 @@ TARGET_ARM=bp_arm.${EXT_SO}
 ALL_TARGETS+=${TARGET_ARM}
 
 ${TARGET_ARM}: ${OBJ_ARM}
-	${CC_LIB} $(call libname,bp_arm) ${CFLAGS} -o ${TARGET_ARM} ${OBJ_ARM}
+	${CC_LIB} $(call libname,bp_arm) ${CFLAGS} $(LDFLAGS) -o ${TARGET_ARM} ${OBJ_ARM}
diff --git a/libr/bp/p/x86.mk b/libr/bp/p/x86.mk
index 7a450bc65c..2d42a89604 100644
--- a/libr/bp/p/x86.mk
+++ b/libr/bp/p/x86.mk
@@ -6,4 +6,4 @@ TARGET_X86=bp_x86.${EXT_SO}
 ALL_TARGETS+=${TARGET_X86}
 
 ${TARGET_X86}: ${OBJ_X86}
-	${CC_LIB} $(call libname,bp_x86) ${CFLAGS} -o ${TARGET_X86} ${OBJ_X86}
+	${CC_LIB} $(call libname,bp_x86) ${CFLAGS} $(LDFLAGS) -o ${TARGET_X86} ${OBJ_X86}
diff --git a/libr/io/p/debug.mk b/libr/io/p/debug.mk
index f83145deac..31de59b395 100644
--- a/libr/io/p/debug.mk
+++ b/libr/io/p/debug.mk
@@ -21,5 +21,5 @@ LINKFLAGS+=${SSL_LDFLAGS}
 endif
 
 ${TARGET_IODBG}: ${OBJ_IODBG}
-	${CC} $(call libname,io_debug) ${CFLAGS} ${LDFLAGS_LIB} \
+	${CC} $(call libname,io_debug) ${CFLAGS} ${LDFLAGS_LIB} $(LDFLAGS) \
 		${LINKFLAGS} ${LDFLAGS_LINKPATH}.. ${OBJ_IODBG} -L.. -lr_io
diff --git a/libr/io/p/haret.mk b/libr/io/p/haret.mk
index 3f7e013810..8d1a6aa4c1 100644
--- a/libr/io/p/haret.mk
+++ b/libr/io/p/haret.mk
@@ -19,4 +19,4 @@ LINKFLAGS+=${SSL_LDFLAGS}
 endif
 
 ${TARGET_HARET}: ${OBJ_HARET}
-	${CC} $(call libname,io_haret) ${CFLAGS} ${OBJ_HARET} ${LINKFLAGS}
+	${CC} $(call libname,io_haret) ${CFLAGS} $(LDFLAGS) ${OBJ_HARET} ${LINKFLAGS}
diff --git a/libr/io/p/mach.mk b/libr/io/p/mach.mk
index 70a1f78f38..2018985f94 100644
--- a/libr/io/p/mach.mk
+++ b/libr/io/p/mach.mk
@@ -13,4 +13,5 @@ LINKFLAGS+=-L.. -lr_io
 endif
 
 ${TARGET_MACH}: ${OBJ_MACH}
-	${CC_LIB} $(call libname,io_mach) ${CFLAGS} -o ${TARGET_MACH} ${OBJ_MACH} ${LINKFLAGS}
+	${CC_LIB} $(call libname,io_mach) ${CFLAGS} $(LDFLAGS) \
+		-o ${TARGET_MACH} ${OBJ_MACH} ${LINKFLAGS}
diff --git a/libr/io/p/malloc.mk b/libr/io/p/malloc.mk
index 4d17ee80b4..7bef883229 100644
--- a/libr/io/p/malloc.mk
+++ b/libr/io/p/malloc.mk
@@ -13,4 +13,5 @@ LINKFLAGS+=-L.. -lr_io
 endif
 
 ${TARGET_MALLOC}: ${OBJ_MALLOC}
-	${CC_LIB} $(call libname,io_malloc) ${CFLAGS} -o ${TARGET_MALLOC} ${OBJ_MALLOC} ${LINKFLAGS}
+	${CC_LIB} $(call libname,io_malloc) ${CFLAGS} -o ${TARGET_MALLOC} \
+		${LDFLAGS} ${OBJ_MALLOC} ${LINKFLAGS}
diff --git a/libr/io/p/procpid.mk b/libr/io/p/procpid.mk
index 577171886b..435697ae95 100644
--- a/libr/io/p/procpid.mk
+++ b/libr/io/p/procpid.mk
@@ -6,6 +6,6 @@ ALL_TARGETS+=${TARGET_PROCPID}
 
 ${TARGET_PROCPID}: ${OBJ_PROCPID}
 	${CC} $(call libname,io_procpid) \
-		${CFLAGS} ${LDFLAGS_LIB} \
+		${CFLAGS} ${LDFLAGS_LIB} $(LDFLAGS) \
 		${LDFLAGS_LINKPATH}../../util -L../../util -lr_util \
 		${LDFLAGS_LINKPATH}.. -L.. -lr_io ${OBJ_PROCPID}
diff --git a/libr/io/p/ptrace.mk b/libr/io/p/ptrace.mk
index 7fae508d06..e1f3d385a9 100644
--- a/libr/io/p/ptrace.mk
+++ b/libr/io/p/ptrace.mk
@@ -6,6 +6,6 @@ ALL_TARGETS+=${TARGET_PTRACE}
 
 ${TARGET_PTRACE}: ${OBJ_PTRACE}
 	${CC_LIB} ${CFLAGS} -o ${TARGET_PTRACE} ${LDFLAGS_LIB} \
-		$(call libname,io_ptrace) \
+		$(call libname,io_ptrace) $(LDFLAGS) \
 		${LDFLAGS_LINKPATH}../../util -L../../util -lr_util \
 		${LDFLAGS_LINKPATH}.. -L.. -lr_io ${OBJ_PTRACE}
diff --git a/libr/io/p/shm.mk b/libr/io/p/shm.mk
index d8f927a1bc..d8c3c34fc6 100644
--- a/libr/io/p/shm.mk
+++ b/libr/io/p/shm.mk
@@ -13,4 +13,5 @@ LINKFLAGS+=-L.. -lr_io
 endif
 
 ${TARGET_SHM}: ${OBJ_SHM}
-	${CC_LIB} $(call libname,io_shm) ${CFLAGS} -o ${TARGET_SHM} ${OBJ_SHM} ${LINKFLAGS}
+	${CC_LIB} $(call libname,io_shm) ${CFLAGS} $(LDFLAGS) \
+		-o ${TARGET_SHM} ${OBJ_SHM} ${LINKFLAGS}
diff --git a/libr/io/p/w32dbg.mk b/libr/io/p/w32dbg.mk
index 0e2c4d79f5..58fec51965 100644
--- a/libr/io/p/w32dbg.mk
+++ b/libr/io/p/w32dbg.mk
@@ -6,5 +6,5 @@ ALL_TARGETS+=${TARGET_W32DBG}
 
 ${TARGET_W32DBG}: ${OBJ_W32DBG}
 	${CC_LIB} $(call libname,io_w32dbg) ${CFLAGS} \
-		-L../../util -lr_util \
+		-L../../util -lr_util $(LDFLAGS) \
 		-o ${TARGET_W32DBG} ${OBJ_W32DBG}
diff --git a/libr/parse/p/arm_pseudo.mk b/libr/parse/p/arm_pseudo.mk
index a2f40536a7..4aed90ea30 100644
--- a/libr/parse/p/arm_pseudo.mk
+++ b/libr/parse/p/arm_pseudo.mk
@@ -7,4 +7,5 @@ LIBDEPS=-L../../util -lr_util
 LIBDEPS+=-L../../flags -lr_flags
 
 ${TARGET_ARMPSEUDO}: ${OBJ_ARMPSEUDO}
-	${CC} $(call libname,parse_arm_pseudo) ${LIBDEPS} -shared ${CFLAGS} -o ${TARGET_ARMPSEUDO} ${OBJ_ARMPSEUDO}
+	${CC} $(call libname,parse_arm_pseudo) ${LIBDEPS} $(LDFLAGS) \
+		-shared ${CFLAGS} -o ${TARGET_ARMPSEUDO} ${OBJ_ARMPSEUDO}
diff --git a/libr/parse/p/mreplace.mk b/libr/parse/p/mreplace.mk
index a4f5f11469..97a7e3520d 100644
--- a/libr/parse/p/mreplace.mk
+++ b/libr/parse/p/mreplace.mk
@@ -5,5 +5,6 @@ ALL_TARGETS+=${TARGET_MREPLACE}
 STATIC_OBJ+=${OBJ_MREPLACE}
 
 ${TARGET_MREPLACE}: ${OBJ_MREPLACE}
-	${CC} $(call libname,parse_mreplace) ${CFLAGS} ${OBJ_MREPLACE} \
+	${CC} $(call libname,parse_mreplace) ${CFLAGS} $(LDFLAGS) \
+		${OBJ_MREPLACE} \
 		-L ../util -L ../../util -lr_util
diff --git a/libr/parse/p/x86_pseudo.mk b/libr/parse/p/x86_pseudo.mk
index 241463f594..bbbe222a79 100644
--- a/libr/parse/p/x86_pseudo.mk
+++ b/libr/parse/p/x86_pseudo.mk
@@ -7,4 +7,5 @@ LIBDEPS=-L../../util -lr_util
 LIBDEPS+=-L../../flags -lr_flags
 
 ${TARGET_X86PSEUDO}: ${OBJ_X86PSEUDO}
-	${CC} $(call libname,parse_x86_pseudo) ${LIBDEPS} -shared ${CFLAGS} -o ${TARGET_X86PSEUDO} ${OBJ_X86PSEUDO}
+	${CC} $(call libname,parse_x86_pseudo) ${LIBDEPS} $(LDFLAGS) \
+		-shared ${CFLAGS} -o ${TARGET_X86PSEUDO} ${OBJ_X86PSEUDO}