|
66 | 66 |
|
67 | 67 | # The default build directory. |
68 | 68 | #------------------------------------------------------------------------------ |
69 | | -BUILD_DIR="build-libbitcoin-node" |
| 69 | +BUILD_SRC_DIR="build-libbitcoin-node" |
70 | 70 |
|
71 | 71 | PRESUMED_CI_PROJECT_PATH=$(pwd) |
72 | 72 |
|
@@ -168,13 +168,13 @@ make_jobs() |
168 | 168 | shift 1 |
169 | 169 |
|
170 | 170 | VERBOSITY="" |
171 | | - if [[ DISPLAY_VERBOSE ]]; then |
| 171 | + if [[ $DISPLAY_VERBOSE ]]; then |
172 | 172 | VERBOSITY="VERBOSE=1" |
173 | 173 | fi |
174 | 174 |
|
175 | 175 | SEQUENTIAL=1 |
176 | 176 | # Avoid setting -j1 (causes problems on single threaded systems [TRAVIS]). |
177 | | - if [[ $JOBS > $SEQUENTIAL ]]; then |
| 177 | + if [[ $JOBS -gt $SEQUENTIAL ]]; then |
178 | 178 | make -j"$JOBS" "$@" $VERBOSITY |
179 | 179 | else |
180 | 180 | make "$@" $VERBOSITY |
@@ -279,7 +279,7 @@ parse_command_line_options() |
279 | 279 | (--build-secp256k1) BUILD_SECP256K1="yes";; |
280 | 280 |
|
281 | 281 | # Unique script options. |
282 | | - (--build-dir=*) BUILD_DIR="${OPTION#*=}";; |
| 282 | + (--build-dir=*) BUILD_SRC_DIR="${OPTION#*=}";; |
283 | 283 | (--preset=*) PRESET_ID="${OPTION#*=}";; |
284 | 284 |
|
285 | 285 | # Handle ndebug declarations due to disabled argument passthrough |
@@ -515,7 +515,7 @@ display_configuration() |
515 | 515 | display_message "BUILD_BOOST : $BUILD_BOOST" |
516 | 516 | display_message "BUILD_SECP256K1 : $BUILD_SECP256K1" |
517 | 517 | display_message "BOOST_ROOT : $BOOST_ROOT" |
518 | | - display_message "BUILD_DIR : $BUILD_DIR" |
| 518 | + display_message "BUILD_SRC_DIR : $BUILD_SRC_DIR" |
519 | 519 | display_message "PRESET_ID : $PRESET_ID" |
520 | 520 | display_message "CUMULATIVE_FILTERED_ARGS : $CUMULATIVE_FILTERED_ARGS" |
521 | 521 | display_message "CUMULATIVE_FILTERED_ARGS_CMAKE : $CUMULATIVE_FILTERED_ARGS_CMAKE" |
@@ -1116,10 +1116,10 @@ BITCOIN_NODE_OPTIONS=( |
1116 | 1116 | display_configuration |
1117 | 1117 |
|
1118 | 1118 | if [[ ! ($CI == true) ]]; then |
1119 | | - create_directory "$BUILD_DIR" |
1120 | | - push_directory "$BUILD_DIR" |
| 1119 | + create_directory "$BUILD_SRC_DIR" |
| 1120 | + push_directory "$BUILD_SRC_DIR" |
1121 | 1121 | else |
1122 | | - push_directory "$BUILD_DIR" |
| 1122 | + push_directory "$BUILD_SRC_DIR" |
1123 | 1123 | fi |
1124 | 1124 |
|
1125 | 1125 | initialize_git |
|
0 commit comments