From a534b623b95ea8ee1cb788e60810a7efcc8dd5fb Mon Sep 17 00:00:00 2001
From: Nathan Phillip Brink <ohnobinki@ohnopublishing.net>
Date: Thu, 13 Jan 2011 21:47:54 -0500
Subject: bug #351622: Use CFLAGS during linking.

Fix compilation on portage-multilib.
---
 mk/lib.mk  | 2 +-
 mk/prog.mk | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/mk/lib.mk b/mk/lib.mk
index 16c16a54..a5682dd9 100644
--- a/mk/lib.mk
+++ b/mk/lib.mk
@@ -38,7 +38,7 @@ ${SHLIB_NAME}:	${SOBJS}
 	@${ECHO} building shared library $@
 	@rm -f $@ ${SHLIB_LINK}
 	@ln -fs $@ ${SHLIB_LINK}
-	${CC} ${LDFLAGS} -shared -Wl,-x \
+	${CC} ${CFLAGS} ${LDFLAGS} -shared -Wl,-x \
 	-o $@ -Wl,-soname,${SONAME} \
 	${SOBJS} ${LDADD}
 
diff --git a/mk/prog.mk b/mk/prog.mk
index 33929fba..76227e78 100644
--- a/mk/prog.mk
+++ b/mk/prog.mk
@@ -28,7 +28,7 @@ all: depend ${PROG}
 	${CC} ${CFLAGS} ${CPPFLAGS} -c $< -o $@
 
 ${PROG}: ${SCRIPTS} ${OBJS}
-	${CC} ${LDFLAGS} -o $@ ${OBJS} ${LDADD}
+	${CC} ${CFLAGS} ${LDFLAGS} -o $@ ${OBJS} ${LDADD}
 
 clean:
 	rm -f ${CLEANFILES}
-- 
cgit v1.2.3