aboutsummaryrefslogtreecommitdiffstats
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
commit564a66ce2f465bdb0d424979eac75fe0261aaad1 (patch)
treedc362aa2d9cf604b568afc5278f79b0baae81c6c
parentb8706baf11be58c7803186f06e6be8da7c3338a7 (diff)
downloaddmapi-dev-564a66ce2f465bdb0d424979eac75fe0261aaad1.tar.gz
Allow LDFLAGS to come from build env, for the Gentoo fringe dwellers.
Merge of master-melb:xfs-cmds:25860a by kenmcd.
-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 1afc479..b0bbeda 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@
prefix = @prefix@
exec_prefix = @exec_prefix@
diff --git a/include/buildmacros b/include/buildmacros
index 928f24f..0c81aaa 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