summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorNathan Scott <nathans@sgi.com>2006-05-02 03:50:41 +0000
committerNathan Scott <nathans@sgi.com>2006-05-02 03:50:41 +0000
commit1c53da1e7b86723646504b95f5114476205e3103 (patch)
tree883eeec4e96e5be4af1c03742526bcf2e2ae7cbc /include
parent9fe48075ca1fac04bc2bd4dd439ba55f9bd73131 (diff)
Allow LDFLAGS to come from build env, for the Gentoo fringe dwellers.
Merge of master-melb:xfs-cmds:25860a by kenmcd.
Diffstat (limited to 'include')
-rw-r--r--include/builddefs.in1
-rw-r--r--include/buildmacros2
2 files changed, 2 insertions, 1 deletions
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