From 1e1c73e28310970b3c9bd1e96975c81a26235340 Mon Sep 17 00:00:00 2001
From: loqs <2227-loqs@users.noreply.gitlab.archlinux.org>
Date: Tue, 16 Jan 2024 22:40:24 +0000
Subject: [PATCH] Split out CPPFLAGS

---
 scripts/libmakepkg/buildenv.sh.in       |  2 +-
 scripts/libmakepkg/buildenv/cpp.sh.in   | 30 +++++++++++++++++++++++++
 scripts/libmakepkg/buildenv/meson.build |  1 +
 3 files changed, 32 insertions(+), 1 deletion(-)
 create mode 100644 scripts/libmakepkg/buildenv/cpp.sh.in

diff --git a/scripts/libmakepkg/buildenv.sh.in b/scripts/libmakepkg/buildenv.sh.in
index ad1d7957..791ae3fb 100644
--- a/scripts/libmakepkg/buildenv.sh.in
+++ b/scripts/libmakepkg/buildenv.sh.in
@@ -25,7 +25,7 @@ LIBMAKEPKG_BUILDENV_SH=1
 MAKEPKG_LIBRARY=${MAKEPKG_LIBRARY:-'@libmakepkgdir@'}
 
 declare -a buildenv_functions buildenv_vars build_options
-buildenv_vars_exported=('CPPFLAGS' 'CFLAGS' 'CXXFLAGS' 'LDFLAGS' 'MAKEFLAGS' 'CHOST')
+buildenv_vars_exported=('CFLAGS' 'CXXFLAGS' 'LDFLAGS' 'MAKEFLAGS' 'CHOST')
 
 for lib in "$MAKEPKG_LIBRARY/buildenv/"*.sh; do
 	source "$lib"
diff --git a/scripts/libmakepkg/buildenv/cpp.sh.in b/scripts/libmakepkg/buildenv/cpp.sh.in
new file mode 100644
index 00000000..f9622f56
--- /dev/null
+++ b/scripts/libmakepkg/buildenv/cpp.sh.in
@@ -0,0 +1,30 @@
+#!/usr/bin/bash
+#
+#   rust.sh - Specify flags for building a package with rust
+#
+#   Copyright (c) 2024 Pacman Development Team <pacman-dev@lists.archlinux.org>
+#
+#   This program is free software; you can redistribute it and/or modify
+#   it under the terms of the GNU General Public License as published by
+#   the Free Software Foundation; either version 2 of the License, or
+#   (at your option) any later version.
+#
+#   This program is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#   GNU General Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License
+#   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+[[ -n "$LIBMAKEPKG_BUILDENV_CPP_SH" ]] && return
+LIBMAKEPKG_BUILDENV_CPP_SH=1
+
+MAKEPKG_LIBRARY=${MAKEPKG_LIBRARY:-'@libmakepkgdir@'}
+
+source "$MAKEPKG_LIBRARY/util/option.sh"
+source "$MAKEPKG_LIBRARY/util/util.sh"
+
+buildenv_vars_exported+=('CPPFLAGS')
+buildenv_functions+=('buildenv_rust')
diff --git a/scripts/libmakepkg/buildenv/meson.build b/scripts/libmakepkg/buildenv/meson.build
index 4c289ac1..c2886902 100644
--- a/scripts/libmakepkg/buildenv/meson.build
+++ b/scripts/libmakepkg/buildenv/meson.build
@@ -3,6 +3,7 @@ libmakepkg_module = 'buildenv'
 sources = [
   'buildflags.sh.in',
   'compiler.sh.in',
+  'cpp.sh.in',
   'debugflags.sh.in',
   'lto.sh.in',
   'makeflags.sh.in',