From: Nathan Scott <nathans@sgi.com>
Date: Tue, 2 May 2006 03:50:41 +0000 (+0000)
Subject: Allow LDFLAGS to come from build env, for the Gentoo fringe dwellers.
X-Git-Tag: v1.1.0~650
X-Git-Url: http://git.apps.os.sepia.ceph.com/?p=xfstests-dev.git;a=commitdiff_plain;h=1c53da1e7b86723646504b95f5114476205e3103

Allow LDFLAGS to come from build env, for the Gentoo fringe dwellers.
Merge of master-melb:xfs-cmds:25860a by kenmcd.
---

diff --git a/include/builddefs.in b/include/builddefs.in
index 353ab239..a98efdf2 100644
--- a/include/builddefs.in
+++ b/include/builddefs.in
@@ -10,6 +10,7 @@ _BUILDDEFS_INCLUDED_ = 1
 DEBUG = @debug_build@
 OPTIMIZER = @opt_build@
 MALLOCLIB = @malloc_lib@
+LOADERFLAGS = @LDFLAGS@
 
 LIBXFS = @libxfs@
 LIBACL = @libacl@
diff --git a/include/buildmacros b/include/buildmacros
index 41a4ef92..c189983b 100644
--- a/include/buildmacros
+++ b/include/buildmacros
@@ -9,7 +9,7 @@ BUILDRULES = $(TOPDIR)/include/buildrules
 # $(CXXFILES), or $(HFILES) and is used to construct the manifest list
 # during the "dist" phase (packaging).
 
-LDFLAGS = $(LLDFLAGS)
+LDFLAGS += $(LOADERFLAGS) $(LLDFLAGS)
 LDLIBS = $(LLDLIBS) $(PLDLIBS) $(MALLOCLIB)
 
 MAKEOPTS = --no-print-directory