From 1c1f7b19dd8ce933354e46084f80e23e2f94424a Mon Sep 17 00:00:00 2001 From: crazywhalecc Date: Mon, 9 Jun 2025 11:13:54 +0800 Subject: [PATCH] Add XXX_CXXFLAGS for common build --- src/SPC/builder/traits/UnixLibraryTrait.php | 9 +++++++++ src/SPC/util/UnixShell.php | 1 + 2 files changed, 10 insertions(+) diff --git a/src/SPC/builder/traits/UnixLibraryTrait.php b/src/SPC/builder/traits/UnixLibraryTrait.php index 8e69f6d3..f302bbfa 100644 --- a/src/SPC/builder/traits/UnixLibraryTrait.php +++ b/src/SPC/builder/traits/UnixLibraryTrait.php @@ -118,4 +118,13 @@ trait UnixLibraryTrait { return getenv($this->getSnakeCaseName() . '_LIBS') ?: ''; } + + public function getLibExtraCXXFlags(): string + { + $env = getenv($this->getSnakeCaseName() . '_CXXFLAGS') ?: ''; + if (!str_contains($env, $this->builder->arch_cxx_flags)) { + $env .= $this->builder->arch_cxx_flags; + } + return $env; + } } diff --git a/src/SPC/util/UnixShell.php b/src/SPC/util/UnixShell.php index 957d66a6..be80cb4c 100644 --- a/src/SPC/util/UnixShell.php +++ b/src/SPC/util/UnixShell.php @@ -70,6 +70,7 @@ class UnixShell 'CFLAGS' => $library->getLibExtraCFlags(), 'LDFLAGS' => $library->getLibExtraLdFlags(), 'LIBS' => $library->getLibExtraLibs(), + 'CXXFLAGS' => $library->getLibExtraCXXFlags(), ]); return $this; }