diff options
| author | Kyle Schwarz <zeranoe@gmail.com> | 2023-01-29 20:35:59 -0500 |
|---|---|---|
| committer | Toni Uhlig <matzeton@googlemail.com> | 2023-04-20 15:43:51 +0200 |
| commit | ecc9ee75457ad903d98f263443d68a94ed660e41 (patch) | |
| tree | 6e05c0ff74ef5b80ab7dccc0c792d5ae196e6486 | |
| parent | 0cdc8c865adaf8bae4a245e44db9bdd5df496c95 (diff) | |
Consolidate path variables
| -rwxr-xr-x | mingw-w64-build | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/mingw-w64-build b/mingw-w64-build index c4879dc..02c11b7 100755 --- a/mingw-w64-build +++ b/mingw-w64-build @@ -439,12 +439,6 @@ while :; do shift done -SRC_PATH="$ROOT_PATH/src" -BLD_PATH="$ROOT_PATH/bld" -LOG_FILE="$ROOT_PATH/build.log" -I686_PREFIX="$ROOT_PATH/i686" -X86_64_PREFIX="$ROOT_PATH/x86_64" - if [ ! "$BUILD_I686" ] && [ ! "$BUILD_X86_64" ]; then arg_error "no ARCH was specified" fi @@ -492,9 +486,16 @@ fi TOTAL_STEPS=$((TOTAL_STEPS + THREADS_STEPS + BUILD_STEPS)) +SRC_PATH="$ROOT_PATH/src" +BLD_PATH="$ROOT_PATH/bld" +LOG_FILE="$ROOT_PATH/build.log" + if [ "$PREFIX" ]; then I686_PREFIX="$PREFIX" X86_64_PREFIX="$PREFIX" +else + I686_PREFIX="$ROOT_PATH/i686" + X86_64_PREFIX="$ROOT_PATH/x86_64" fi CURRENT_STEP=1 |