Skip to content

Commit

Permalink
Merge bitcoin#14036: travis: Run unit tests --with-sanitizers=undefined
Browse files Browse the repository at this point in the history
fad8afa travis: Run unit tests --with-sanitizers=undefined (MarcoFalke)
0d00fd5 depends: allow CC/CXX to be overridden during configure (Cory Fields)

Pull request description:

  See issue bitcoin#12691

Tree-SHA512: 0772e8e037411cb4664270945a0fc9c0c1ed24eeaf5308460baee707868f7b700d8e740a6babb1d02bc818a8a4b71d9e33601ab2cc850ff315755fcf3d79d29e

# Conflicts:
#	.travis.yml
  • Loading branch information
laanwj authored and Munkybooty committed Jul 2, 2021
1 parent 8a6e8d7 commit 49e86df
Showing 1 changed file with 6 additions and 3 deletions.
9 changes: 6 additions & 3 deletions depends/config.site.in
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,12 @@ export PKG_CONFIG_PATH=$depends_prefix/share/pkgconfig
CPPFLAGS="-I$depends_prefix/include/ $CPPFLAGS"
LDFLAGS="-L$depends_prefix/lib $LDFLAGS"

CC="@CC@"
CXX="@CXX@"
OBJC="${CC}"
if test -n "@CC@" -a -z "${CC}"; then
CC="@CC@"
fi
if test -n "@CXX@" -a -z "${CXX}"; then
CXX="@CXX@"
fi
PYTHONPATH=$depends_prefix/native/lib/python/dist-packages:$PYTHONPATH

if test -n "@AR@"; then
Expand Down

0 comments on commit 49e86df

Please sign in to comment.