From 993c3ed6a3cee274e94ed217a19fb3b612031dee Mon Sep 17 00:00:00 2001
From: Petr Baudis <pasky@ucw.cz>
Date: Sun, 13 Nov 2011 20:01:06 +0100
Subject: [PATCH] Makefile: Call ld with -l library parameters listed last

Fixes compilatoin for Dangerzone w/ gcc-4.6.1.
---
 Makefile     | 8 +++++---
 Makefile.lib | 4 ++--
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index 44515f0..89339b6 100644
--- a/Makefile
+++ b/Makefile
@@ -51,10 +51,12 @@ CUSTOM_CFLAGS=-Wall -ggdb3 -O3 -std=gnu99 -frename-registers -pthread -Wsign-com
 
 ifdef MAC
 	SYS_CFLAGS=-DNO_THREAD_LOCAL
-	LDFLAGS=-lm -pthread -ldl -rdynamic
+	LDFLAGS=-pthread -rdynamic
+	LIBS=-lm -ldl
 else
 	SYS_CFLAGS=-march=native
-	LDFLAGS=-lm -pthread -lrt -ldl -rdynamic
+	LDFLAGS=-pthread -rdynamic
+	LIBS=-lm -lrt -ldl
 endif
 
 ifdef DOUBLE
@@ -68,7 +70,7 @@ else
 	# Whee, an extra register!
 	CUSTOM_CFLAGS+=-fomit-frame-pointer
 ifeq ($(PROFILING), perftools)
-	LDFLAGS+=-lprofiler
+	LIBS+=-lprofiler
 endif
 endif
 
diff --git a/Makefile.lib b/Makefile.lib
index 559916b..9150799 100644
--- a/Makefile.lib
+++ b/Makefile.lib
@@ -33,7 +33,7 @@ quiet_cmd_archive = '[AR]   $@'
       cmd_archive = $(AR) r $@ $^
 
    quiet_cmd_link = '[LINK] $@'
-         cmd_link = $(LINK) -o $@ $^
+         cmd_link = $(LINK) -o $@ $^ $(LIBS)
 
 # Recursive make
 quiet_cmd_recmake = "[MAKE $$target]   $$subdir"
@@ -46,7 +46,7 @@ quiet_cmd_recmake = "[MAKE $$target]   $$subdir"
 unexport CFLAGS
 CFLAGS += $(CUSTOM_CFLAGS) $(XCFLAGS) $(INCLUDES) $(SYS_CFLAGS)
 COMPILE = $(CC) $(CFLAGS)
-LINK = $(CC) $(LDFLAGS) $(XLDFLAGS) $(LIBS)
+LINK = $(CC) $(LDFLAGS) $(XLDFLAGS)
 
 DEP_FILES_1 = $(foreach src,$(OBJS),.deps/$(src))
 DEP_FILES = $(DEP_FILES_1:%.o=%.P)
-- 
2.11.4.GIT