From dd8e3b8b3e2d55c586e80e62d88719909bd8a568 Mon Sep 17 00:00:00 2001
From: Tavian Barnes <tavianator@tavianator.com>
Date: Tue, 21 May 2024 15:53:52 -0400
Subject: build: Allow flags.mk to override command line variables

Previously, during something like ./configure LDFLAGS=..., any additions
to LDFLAGS from the generated makefiles were ignored.  I had thought
that sub-make invocations would allow those variables to be overridden,
but that is not the behaviour of make.  So instead, set _LDFLAGS etc.
in the generated files so that they don't conflict.
---
 build/exports.mk | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'build/exports.mk')

diff --git a/build/exports.mk b/build/exports.mk
index ed19134..913a1aa 100644
--- a/build/exports.mk
+++ b/build/exports.mk
@@ -12,9 +12,9 @@ export XMKDIR=${MKDIR}
 export XPKG_CONFIG=${PKG_CONFIG}
 export XRM=${RM}
 
-export XCPPFLAGS=${CPPFLAGS}
-export XCFLAGS=${CFLAGS}
-export XLDFLAGS=${LDFLAGS}
-export XLDLIBS=${LDLIBS}
+export XCPPFLAGS=${_CPPFLAGS}
+export XCFLAGS=${_CFLAGS}
+export XLDFLAGS=${_LDFLAGS}
+export XLDLIBS=${_LDLIBS}
 
 export XNOLIBS=${NOLIBS}
-- 
cgit v1.2.3