From 6b3d2487f974f74912527e06082fb057a638c0be Mon Sep 17 00:00:00 2001
From: loqs <2227-loqs@users.noreply.gitlab.archlinux.org>
Date: Wed, 17 Jan 2024 19:36:58 +0000
Subject: [PATCH] Move buildflags check and build_options definition to
 scripts/libmakepkg/buildenv.sh.in.

---
 scripts/libmakepkg/buildenv.sh.in            | 6 ++++--
 scripts/libmakepkg/buildenv/buildflags.sh.in | 6 +-----
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/scripts/libmakepkg/buildenv.sh.in b/scripts/libmakepkg/buildenv.sh.in
index 370b2e70..ff7ea2a4 100644
--- a/scripts/libmakepkg/buildenv.sh.in
+++ b/scripts/libmakepkg/buildenv.sh.in
@@ -26,6 +26,7 @@ MAKEPKG_LIBRARY=${MAKEPKG_LIBRARY:-'@libmakepkgdir@'}
 
 declare -a buildenv_functions buildenv_vars build_options
 buildenv_vars_exported=('LDFLAGS' 'MAKEFLAGS' 'CHOST')
+build_options+=('buildflags')
 
 for lib in "$MAKEPKG_LIBRARY/buildenv/"*.sh; do
 	source "$lib"
@@ -47,8 +48,9 @@ check_append_debug_flags() {
 }
 
 prepare_buildenv() {
-	# ensure this function runs first
-	buildenv_buildflags
+	if check_option "buildflags" "n"; then
+		unset ${buildenv_vars_exported[@]}
+	fi
 
 	for func in ${buildenv_functions[@]}; do
 		$func
diff --git a/scripts/libmakepkg/buildenv/buildflags.sh.in b/scripts/libmakepkg/buildenv/buildflags.sh.in
index ade28539..31ad1d52 100644
--- a/scripts/libmakepkg/buildenv/buildflags.sh.in
+++ b/scripts/libmakepkg/buildenv/buildflags.sh.in
@@ -25,10 +25,6 @@ MAKEPKG_LIBRARY=${MAKEPKG_LIBRARY:-'@libmakepkgdir@'}
 
 source "$MAKEPKG_LIBRARY/util/option.sh"
 
-build_options+=('buildflags')
-
 buildenv_buildflags() {
-	if check_option "buildflags" "n"; then
-		unset ${buildenv_vars_exported[@]}
-	fi
+	:
 }