|
64 | 64 |
|
65 | 65 | # The default build directory. |
66 | 66 | #------------------------------------------------------------------------------ |
67 | | -BUILD_DIR="build-libbitcoin-database" |
| 67 | +BUILD_SRC_DIR="build-libbitcoin-database" |
68 | 68 |
|
69 | 69 | PRESUMED_CI_PROJECT_PATH=$(pwd) |
70 | 70 |
|
@@ -166,13 +166,13 @@ make_jobs() |
166 | 166 | shift 1 |
167 | 167 |
|
168 | 168 | VERBOSITY="" |
169 | | - if [[ DISPLAY_VERBOSE ]]; then |
| 169 | + if [[ $DISPLAY_VERBOSE ]]; then |
170 | 170 | VERBOSITY="VERBOSE=1" |
171 | 171 | fi |
172 | 172 |
|
173 | 173 | SEQUENTIAL=1 |
174 | 174 | # Avoid setting -j1 (causes problems on single threaded systems [TRAVIS]). |
175 | | - if [[ $JOBS > $SEQUENTIAL ]]; then |
| 175 | + if [[ $JOBS -gt $SEQUENTIAL ]]; then |
176 | 176 | make -j"$JOBS" "$@" $VERBOSITY |
177 | 177 | else |
178 | 178 | make "$@" $VERBOSITY |
@@ -277,7 +277,7 @@ parse_command_line_options() |
277 | 277 | (--build-secp256k1) BUILD_SECP256K1="yes";; |
278 | 278 |
|
279 | 279 | # Unique script options. |
280 | | - (--build-dir=*) BUILD_DIR="${OPTION#*=}";; |
| 280 | + (--build-dir=*) BUILD_SRC_DIR="${OPTION#*=}";; |
281 | 281 | (--preset=*) PRESET_ID="${OPTION#*=}";; |
282 | 282 |
|
283 | 283 | # Handle ndebug declarations due to disabled argument passthrough |
@@ -509,7 +509,7 @@ display_configuration() |
509 | 509 | display_message "BUILD_BOOST : $BUILD_BOOST" |
510 | 510 | display_message "BUILD_SECP256K1 : $BUILD_SECP256K1" |
511 | 511 | display_message "BOOST_ROOT : $BOOST_ROOT" |
512 | | - display_message "BUILD_DIR : $BUILD_DIR" |
| 512 | + display_message "BUILD_SRC_DIR : $BUILD_SRC_DIR" |
513 | 513 | display_message "PRESET_ID : $PRESET_ID" |
514 | 514 | display_message "CUMULATIVE_FILTERED_ARGS : $CUMULATIVE_FILTERED_ARGS" |
515 | 515 | display_message "CUMULATIVE_FILTERED_ARGS_CMAKE : $CUMULATIVE_FILTERED_ARGS_CMAKE" |
@@ -1082,10 +1082,10 @@ BITCOIN_DATABASE_OPTIONS=( |
1082 | 1082 | display_configuration |
1083 | 1083 |
|
1084 | 1084 | if [[ ! ($CI == true) ]]; then |
1085 | | - create_directory "$BUILD_DIR" |
1086 | | - push_directory "$BUILD_DIR" |
| 1085 | + create_directory "$BUILD_SRC_DIR" |
| 1086 | + push_directory "$BUILD_SRC_DIR" |
1087 | 1087 | else |
1088 | | - push_directory "$BUILD_DIR" |
| 1088 | + push_directory "$BUILD_SRC_DIR" |
1089 | 1089 | fi |
1090 | 1090 |
|
1091 | 1091 | initialize_git |
|
0 commit comments