DragonX/dragonx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

zcutil/build.sh: Use config.site to set default ./configure settings

Browse Source 
This is a more reliable way to configure the depends path (matching what is done
upstream), and frees up --prefix for user configuration.
This commit is contained in:
Jack Grigg
2018-04-14 10:49:24 -06:00
parent d10a762fb8
commit 03ea5a8122
1 changed files with 1 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
zcutil/build.sh
View File

@@ -33,14 +33,6 @@ if [[ -z "${HOST-}" ]]; then
HOST="$BUILD" HOST="$BUILD"
fi fi
# Allow override to $CC and $CXX for porters. Most users will not need it.
if [[ -z "${CC-}" ]]; then
CC=gcc
fi
if [[ -z "${CXX-}" ]]; then
CXX=g++
fi
# Allow users to set arbitrary compile flags. Most users will not need this. # Allow users to set arbitrary compile flags. Most users will not need this.
if [[ -z "${CONFIGURE_FLAGS-}" ]]; then if [[ -z "${CONFIGURE_FLAGS-}" ]]; then
CONFIGURE_FLAGS="" CONFIGURE_FLAGS=""
@@ -105,15 +97,11 @@ then
shift shift
fi fi
PREFIX="$(pwd)/depends/$HOST/"
eval "$MAKE" --version eval "$MAKE" --version
eval "$CC" --version
eval "$CXX" --version
as --version as --version
ld -v ld -v
HOST="$HOST" BUILD="$BUILD" NO_PROTON="$PROTON_ARG" "$MAKE" "$@" -C ./depends/ V=1 HOST="$HOST" BUILD="$BUILD" NO_PROTON="$PROTON_ARG" "$MAKE" "$@" -C ./depends/ V=1
./autogen.sh ./autogen.sh
CC="$CC" CXX="$CXX" ./configure --prefix="${PREFIX}" --host="$HOST" --build="$BUILD" "$HARDENING_ARG" "$LCOV_ARG" "$TEST_ARG" "$MINING_ARG" "$PROTON_ARG" $CONFIGURE_FLAGS --enable-werror CXXFLAGS='-g' CONFIG_SITE="$PWD/depends/$HOST/share/config.site" ./configure "$HARDENING_ARG" "$LCOV_ARG" "$TEST_ARG" "$MINING_ARG" "$PROTON_ARG" $CONFIGURE_FLAGS --enable-werror CXXFLAGS='-g'
"$MAKE" "$@" V=1 "$MAKE" "$@" V=1