diff options
| author | The King <27705324+jlukanc1@users.noreply.github.com> | 2021-01-24 16:01:14 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-24 16:01:14 -0500 |
| commit | 8c3df5f0211e0cc31de90039a73fe48b9a9aafe0 (patch) | |
| tree | 88fc0671a629b27793a418df76f543c7913b644a /docker/build.sh | |
| parent | 51c8cadcb78bdbe9013f5aace629c96ed3dfd06f (diff) | |
| parent | 80838d1e42e83b50188d6237d16c81cfa27781a6 (diff) | |
Merge branch 'develop' into upstream-dev
Diffstat (limited to 'docker/build.sh')
| -rwxr-xr-x | docker/build.sh | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/docker/build.sh b/docker/build.sh index f35c2f3a..8f0d0fa9 100755 --- a/docker/build.sh +++ b/docker/build.sh @@ -31,8 +31,8 @@ main() { CmakeGenerate CmakeBuild $target - - if [[ "$DISABLE_POSTBUILD" != "true" ]]; then + BUILD_RESULT=$? + if [ "$DISABLE_POSTBUILD" != "true" -a "$BUILD_RESULT" == 0 ]; then source "$BUILD_DIR/post_build.sh" fi } @@ -70,7 +70,9 @@ CmakeGenerate() { CmakeBuild() { local target="$1" [[ -n "$target" ]] && target="--target $target" - cmake --build "$BUILD_DIR" --config $BUILD_TYPE $target -- -j$(nproc) + if cmake --build "$BUILD_DIR" --config $BUILD_TYPE $target -- -j$(nproc) + then return 0; else return 1; + fi } [[ $SOURCED == "false" ]] && main "$@" || echo "Sourced!"
\ No newline at end of file |