From: Mark Wielaard <mjw@redhat.com>
Date: Thu, 18 Dec 2014 23:06:26 +0000 (+0100)
Subject: Merge branch 'master' into portable
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bd0434b61e0317718eb159fe7b5dc9ea870a0b79;p=thirdparty%2Felfutils.git

Merge branch 'master' into portable
---

bd0434b61e0317718eb159fe7b5dc9ea870a0b79
diff --cc backends/Makefile.am
index 5b49108b2,687c089d3..5ab9f9fdb
--- a/backends/Makefile.am
+++ b/backends/Makefile.am
@@@ -119,8 -119,8 +119,8 @@@ libebl_%.so libebl_%.map: libebl_%_pic.
  	$(LINK) -shared -o $(@:.map=.so) \
  		-Wl,--whole-archive $< $(cpu_$*) -Wl,--no-whole-archive \
  		-Wl,--version-script,$(@:.so=.map) \
 -		-Wl,-z,defs -Wl,--as-needed $(libelf) $(libdw)
 +		-Wl,-z,defs $(LD_AS_NEEDED) $(libelf) $(libdw)
- 	$(textrel_check)
+ 	@$(textrel_check)
  
  libebl_i386.so: $(cpu_i386)
  libebl_x86_64.so: $(cpu_x86_64)