Skip to content

Commit 0d2c317

Browse files
intrigus-lgtmripatel-fd
authored andcommitted
deps.sh: also make EXTRA_{CXXFLAGS|LDFLAGS} robust
Similar to #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)
1 parent 6d0ba7f commit 0d2c317

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

deps.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -666,8 +666,8 @@ while [[ $# -gt 0 ]]; do
666666
_CC=clang
667667
_CXX=clang++
668668
EXTRA_CFLAGS+=" -fsanitize=memory"
669-
EXTRA_CXXFLAGS+="$EXTRA_CFLAGS -nostdinc++ -nostdlib++ -isystem $PREFIX/include/c++/v1"
670-
EXTRA_LDFLAGS+="$PREFIX/lib/libc++.a $PREFIX/lib/libc++abi.a"
669+
EXTRA_CXXFLAGS+=" $EXTRA_CFLAGS -nostdinc++ -nostdlib++ -isystem $PREFIX/include/c++/v1"
670+
EXTRA_LDFLAGS+=" $PREFIX/lib/libc++.a $PREFIX/lib/libc++abi.a"
671671
;;
672672
"+dev")
673673
shift

0 commit comments

Comments
 (0)