From 8f36aac35e3d1455284e5357fa7694a6b635853b Mon Sep 17 00:00:00 2001 From: timerix Date: Tue, 16 Aug 2022 22:10:53 +0600 Subject: [PATCH] build scripts fixes --- build_scripts/build_configurations/build.sh | 4 +--- build_scripts/build_configurations/build_dbg.sh | 6 ++---- build_scripts/default.config.sh | 2 +- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/build_scripts/build_configurations/build.sh b/build_scripts/build_configurations/build.sh index 33c7056..6c904b5 100644 --- a/build_scripts/build_configurations/build.sh +++ b/build_scripts/build_configurations/build.sh @@ -7,9 +7,7 @@ clear_dir "$OUTDIR" clear_dir "$OBJDIR" cd kerep -if [ ! -f "bin/kerep.a" ]; then - make build_static_lib -fi +make build_static_lib cp bin/kerep.a ../obj/ printf "${GREEN}copied ${CYAN}kerep.a\n" cd .. diff --git a/build_scripts/build_configurations/build_dbg.sh b/build_scripts/build_configurations/build_dbg.sh index 4ea09e9..adc5497 100644 --- a/build_scripts/build_configurations/build_dbg.sh +++ b/build_scripts/build_configurations/build_dbg.sh @@ -7,13 +7,11 @@ clear_dir "$OUTDIR" clear_dir "$OBJDIR" cd kerep -if [ ! -f "bin/kerep.a" ]; then - make build_static_lib_dbg -fi +make build_static_lib_dbg cp bin/kerep.a ../obj/ printf "${GREEN}copied ${CYAN}kerep.a\n" cd .. compile_c "$BUILD_DBG_C_ARGS" "$SRC_C" compile_cpp "$BUILD_DBG_CPP_ARGS" "$SRC_CPP" -link "$BUILD_DBG_CPP_ARGS $BUILD_DBG_LINKER_ARGS" "$BUILD_FILE" +link "$BUILD_DBG_CPP_ARGS $BUILD_DBG_LINKER_ARGS" "$BUILD_DBG_FILE" diff --git a/build_scripts/default.config.sh b/build_scripts/default.config.sh index d90ab94..12e0046 100644 --- a/build_scripts/default.config.sh +++ b/build_scripts/default.config.sh @@ -19,7 +19,7 @@ BUILD_CPP_ARGS="$BUILD_C_ARGS" BUILD_LINKER_ARGS="" # build_dbg -BUILD_DBG_FILE="$TEST_FILE.dbg" +BUILD_DBG_FILE="$BUILD_FILE.dbg" BUILD_DBG_C_ARGS="-O0 -g" BUILD_DBG_CPP_ARGS="$BUILD_DBG_C_ARGS" BUILD_DBG_LINKER_ARGS=""