Skip to content

Commit afbff60

Browse files
pmienkpmienk
authored
Merge pull request #1737 from pmienk/master
Regenerate artifacts.
2 parents c7b1d29 + 8d6acbb commit afbff60

3 files changed

Lines changed: 24 additions & 39 deletions

File tree

‎install-cmake.sh‎

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ fi
5757

5858
# The default build directory.
5959
#------------------------------------------------------------------------------
60-
BUILD_DIR="build-libbitcoin-system"
60+
BUILD_SRC_DIR="build-libbitcoin-system"
6161

6262
PRESUMED_CI_PROJECT_PATH=$(pwd)
6363

@@ -159,13 +159,13 @@ make_jobs()
159159
shift 1
160160

161161
VERBOSITY=""
162-
if [[ DISPLAY_VERBOSE ]]; then
162+
if [[ $DISPLAY_VERBOSE ]]; then
163163
VERBOSITY="VERBOSE=1"
164164
fi
165165

166166
SEQUENTIAL=1
167167
# Avoid setting -j1 (causes problems on single threaded systems [TRAVIS]).
168-
if [[ $JOBS > $SEQUENTIAL ]]; then
168+
if [[ $JOBS -gt $SEQUENTIAL ]]; then
169169
make -j"$JOBS" "$@" $VERBOSITY
170170
else
171171
make "$@" $VERBOSITY
@@ -269,7 +269,7 @@ parse_command_line_options()
269269
(--build-secp256k1) BUILD_SECP256K1="yes";;
270270

271271
# Unique script options.
272-
(--build-dir=*) BUILD_DIR="${OPTION#*=}";;
272+
(--build-dir=*) BUILD_SRC_DIR="${OPTION#*=}";;
273273

274274
# Handle ndebug declarations due to disabled argument passthrough
275275
(--enable-ndebug) ENABLE_NDEBUG="yes";;
@@ -323,11 +323,6 @@ set_os_specific_compiler_settings()
323323
else # Linux
324324
STDLIB="stdc++"
325325
fi
326-
327-
if [[ ($OS == Darwin) && ($CC == clang*) ]]; then
328-
CFLAGS="${CFLAGS} -DBOOST_NO_CXX98_FUNCTION_BASE"
329-
CXXFLAGS="${CXXFLAGS} -DBOOST_NO_CXX98_FUNCTION_BASE"
330-
fi
331326
}
332327

333328
link_to_standard_library()
@@ -478,7 +473,7 @@ display_configuration()
478473
display_message "BUILD_BOOST : $BUILD_BOOST"
479474
display_message "BUILD_SECP256K1 : $BUILD_SECP256K1"
480475
display_message "BOOST_ROOT : $BOOST_ROOT"
481-
display_message "BUILD_DIR : $BUILD_DIR"
476+
display_message "BUILD_SRC_DIR : $BUILD_SRC_DIR"
482477
display_message "CUMULATIVE_FILTERED_ARGS : $CUMULATIVE_FILTERED_ARGS"
483478
display_message "CUMULATIVE_FILTERED_ARGS_CMAKE : $CUMULATIVE_FILTERED_ARGS_CMAKE"
484479
display_message "PREFIX : $PREFIX"
@@ -1031,10 +1026,10 @@ BITCOIN_SYSTEM_OPTIONS=(
10311026
display_configuration
10321027

10331028
if [[ ! ($CI == true) ]]; then
1034-
create_directory "$BUILD_DIR"
1035-
push_directory "$BUILD_DIR"
1029+
create_directory "$BUILD_SRC_DIR"
1030+
push_directory "$BUILD_SRC_DIR"
10361031
else
1037-
push_directory "$BUILD_DIR"
1032+
push_directory "$BUILD_SRC_DIR"
10381033
fi
10391034

10401035
initialize_git

‎install-cmakepresets.sh‎

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ fi
6363

6464
# The default build directory.
6565
#------------------------------------------------------------------------------
66-
BUILD_DIR="build-libbitcoin-system"
66+
BUILD_SRC_DIR="build-libbitcoin-system"
6767

6868
PRESUMED_CI_PROJECT_PATH=$(pwd)
6969

@@ -165,13 +165,13 @@ make_jobs()
165165
shift 1
166166

167167
VERBOSITY=""
168-
if [[ DISPLAY_VERBOSE ]]; then
168+
if [[ $DISPLAY_VERBOSE ]]; then
169169
VERBOSITY="VERBOSE=1"
170170
fi
171171

172172
SEQUENTIAL=1
173173
# Avoid setting -j1 (causes problems on single threaded systems [TRAVIS]).
174-
if [[ $JOBS > $SEQUENTIAL ]]; then
174+
if [[ $JOBS -gt $SEQUENTIAL ]]; then
175175
make -j"$JOBS" "$@" $VERBOSITY
176176
else
177177
make "$@" $VERBOSITY
@@ -276,7 +276,7 @@ parse_command_line_options()
276276
(--build-secp256k1) BUILD_SECP256K1="yes";;
277277

278278
# Unique script options.
279-
(--build-dir=*) BUILD_DIR="${OPTION#*=}";;
279+
(--build-dir=*) BUILD_SRC_DIR="${OPTION#*=}";;
280280
(--preset=*) PRESET_ID="${OPTION#*=}";;
281281

282282
# Handle ndebug declarations due to disabled argument passthrough
@@ -331,11 +331,6 @@ set_os_specific_compiler_settings()
331331
else # Linux
332332
STDLIB="stdc++"
333333
fi
334-
335-
if [[ ($OS == Darwin) && ($CC == clang*) ]]; then
336-
CFLAGS="${CFLAGS} -DBOOST_NO_CXX98_FUNCTION_BASE"
337-
CXXFLAGS="${CXXFLAGS} -DBOOST_NO_CXX98_FUNCTION_BASE"
338-
fi
339334
}
340335

341336
link_to_standard_library()
@@ -517,7 +512,7 @@ display_configuration()
517512
display_message "BUILD_BOOST : $BUILD_BOOST"
518513
display_message "BUILD_SECP256K1 : $BUILD_SECP256K1"
519514
display_message "BOOST_ROOT : $BOOST_ROOT"
520-
display_message "BUILD_DIR : $BUILD_DIR"
515+
display_message "BUILD_SRC_DIR : $BUILD_SRC_DIR"
521516
display_message "PRESET_ID : $PRESET_ID"
522517
display_message "CUMULATIVE_FILTERED_ARGS : $CUMULATIVE_FILTERED_ARGS"
523518
display_message "CUMULATIVE_FILTERED_ARGS_CMAKE : $CUMULATIVE_FILTERED_ARGS_CMAKE"
@@ -1076,10 +1071,10 @@ BITCOIN_SYSTEM_OPTIONS=(
10761071
display_configuration
10771072

10781073
if [[ ! ($CI == true) ]]; then
1079-
create_directory "$BUILD_DIR"
1080-
push_directory "$BUILD_DIR"
1074+
create_directory "$BUILD_SRC_DIR"
1075+
push_directory "$BUILD_SRC_DIR"
10811076
else
1082-
push_directory "$BUILD_DIR"
1077+
push_directory "$BUILD_SRC_DIR"
10831078
fi
10841079

10851080
initialize_git

‎install.sh‎

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ fi
5757

5858
# The default build directory.
5959
#------------------------------------------------------------------------------
60-
BUILD_DIR="build-libbitcoin-system"
60+
BUILD_SRC_DIR="build-libbitcoin-system"
6161

6262
PRESUMED_CI_PROJECT_PATH=$(pwd)
6363

@@ -159,13 +159,13 @@ make_jobs()
159159
shift 1
160160

161161
VERBOSITY=""
162-
if [[ DISPLAY_VERBOSE ]]; then
162+
if [[ $DISPLAY_VERBOSE ]]; then
163163
VERBOSITY="VERBOSE=1"
164164
fi
165165

166166
SEQUENTIAL=1
167167
# Avoid setting -j1 (causes problems on single threaded systems [TRAVIS]).
168-
if [[ $JOBS > $SEQUENTIAL ]]; then
168+
if [[ $JOBS -gt $SEQUENTIAL ]]; then
169169
make -j"$JOBS" "$@" $VERBOSITY
170170
else
171171
make "$@" $VERBOSITY
@@ -269,7 +269,7 @@ parse_command_line_options()
269269
(--build-secp256k1) BUILD_SECP256K1="yes";;
270270

271271
# Unique script options.
272-
(--build-dir=*) BUILD_DIR="${OPTION#*=}";;
272+
(--build-dir=*) BUILD_SRC_DIR="${OPTION#*=}";;
273273
esac
274274
done
275275
}
@@ -318,11 +318,6 @@ set_os_specific_compiler_settings()
318318
else # Linux
319319
STDLIB="stdc++"
320320
fi
321-
322-
if [[ ($OS == Darwin) && ($CC == clang*) ]]; then
323-
CFLAGS="${CFLAGS} -DBOOST_NO_CXX98_FUNCTION_BASE"
324-
CXXFLAGS="${CXXFLAGS} -DBOOST_NO_CXX98_FUNCTION_BASE"
325-
fi
326321
}
327322

328323
link_to_standard_library()
@@ -423,7 +418,7 @@ display_configuration()
423418
display_message "BUILD_BOOST : $BUILD_BOOST"
424419
display_message "BUILD_SECP256K1 : $BUILD_SECP256K1"
425420
display_message "BOOST_ROOT : $BOOST_ROOT"
426-
display_message "BUILD_DIR : $BUILD_DIR"
421+
display_message "BUILD_SRC_DIR : $BUILD_SRC_DIR"
427422
display_message "PREFIX : $PREFIX"
428423
display_message "DISABLE_SHARED : $DISABLE_SHARED"
429424
display_message "DISABLE_STATIC : $DISABLE_STATIC"
@@ -905,10 +900,10 @@ BITCOIN_SYSTEM_OPTIONS=(
905900
display_configuration
906901

907902
if [[ ! ($CI == true) ]]; then
908-
create_directory "$BUILD_DIR"
909-
push_directory "$BUILD_DIR"
903+
create_directory "$BUILD_SRC_DIR"
904+
push_directory "$BUILD_SRC_DIR"
910905
else
911-
push_directory "$BUILD_DIR"
906+
push_directory "$BUILD_SRC_DIR"
912907
fi
913908

914909
initialize_git

0 commit comments

Comments
 (0)