Browse Source
zcutil/build.sh: Use config.site to set default ./configure settings
This is a more reliable way to configure the depends path (matching what is done
upstream), and frees up --prefix for user configuration.
pull/4/head
Jack Grigg
6 years ago
No known key found for this signature in database
GPG Key ID: 1B8D649257DB0829
1 changed files with
1 additions and
13 deletions
-
zcutil/build.sh
|
|
|
@ -33,14 +33,6 @@ if [[ -z "${HOST-}" ]]; then |
|
|
|
HOST="$BUILD" |
|
|
|
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. |
|
|
|
if [[ -z "${CONFIGURE_FLAGS-}" ]]; then |
|
|
|
CONFIGURE_FLAGS="" |
|
|
|
@ -105,15 +97,11 @@ then |
|
|
|
shift |
|
|
|
fi |
|
|
|
|
|
|
|
PREFIX="$(pwd)/depends/$HOST/" |
|
|
|
|
|
|
|
eval "$MAKE" --version |
|
|
|
eval "$CC" --version |
|
|
|
eval "$CXX" --version |
|
|
|
as --version |
|
|
|
ld -v |
|
|
|
|
|
|
|
HOST="$HOST" BUILD="$BUILD" NO_PROTON="$PROTON_ARG" "$MAKE" "$@" -C ./depends/ V=1 |
|
|
|
./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 |
|
|
|
|
