From a595bc135d8ecccbe155be4e8643dafe4ee2b4c0 Mon Sep 17 00:00:00 2001 From: intrigus-lgtm <60750685+intrigus-lgtm@users.noreply.github.com> Date: Tue, 11 Nov 2025 16:18:44 +0100 Subject: [PATCH] deps.sh: also make EXTRA_{CXXFLAGS|LDFLAGS} robust Similar to https://github.com/firedancer-io/firedancer/pull/7156 but also fixes EXTRA_{CXXFLAGS|LDFLAGS} So future code isn't affected once someone starts to use those. (Currently only EXTRA_FLAGS is used: https://github.com/firedancer-io/firedancer/blob/554a075c72deebfc83f8507089100fe0d0d57588/deps.sh#L40-L42) --- deps.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/deps.sh b/deps.sh index b718122695c..9456b305e4f 100755 --- a/deps.sh +++ b/deps.sh @@ -666,8 +666,8 @@ while [[ $# -gt 0 ]]; do _CC=clang _CXX=clang++ EXTRA_CFLAGS+=" -fsanitize=memory" - EXTRA_CXXFLAGS+="$EXTRA_CFLAGS -nostdinc++ -nostdlib++ -isystem $PREFIX/include/c++/v1" - EXTRA_LDFLAGS+="$PREFIX/lib/libc++.a $PREFIX/lib/libc++abi.a" + EXTRA_CXXFLAGS+=" $EXTRA_CFLAGS -nostdinc++ -nostdlib++ -isystem $PREFIX/include/c++/v1" + EXTRA_LDFLAGS+=" $PREFIX/lib/libc++.a $PREFIX/lib/libc++abi.a" ;; "+dev") shift