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 353ab2390090c096f4f98f79cc82c334eb4bb358..a98efdf20588b69c28daac8ba9868a16618f7e02 100644 (file)
--- 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 41a4ef9211d13f50576fb5318a82a25a57dc873e..c189983bb58590013122ff7943021a2e4b364fc2 100644 (file)
--- 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