diff --git a/default.config b/default.config index 27e2a1e..4f05e64 100644 --- a/default.config +++ b/default.config @@ -25,7 +25,6 @@ case $TASK in C_ARGS="-O2" CPP_ARGS="$C_ARGS" LINKER_ARGS="" - LINK_LIBS="" TASK_SCRIPT=cbuild/default_tasks/build_exec.sh PRE_TASK_SCRIPT= POST_TASK_SCRIPT= @@ -34,7 +33,6 @@ case $TASK in C_ARGS="-O0 -g" CPP_ARGS="$C_ARGS" LINKER_ARGS="" - LINK_LIBS="" TASK_SCRIPT=cbuild/default_tasks/build_exec.sh PRE_TASK_SCRIPT= POST_TASK_SCRIPT= @@ -42,7 +40,6 @@ case $TASK in build_shared_lib) C_ARGS="-O2 -fpic -flto -shared" CPP_ARGS="$C_ARGS" - LINK_LIBS="" LINKER_ARGS="-Wl,-soname,$SHARED_LIB_FILE" TASK_SCRIPT=cbuild/default_tasks/build_shared_lib.sh PRE_TASK_SCRIPT= @@ -51,7 +48,6 @@ case $TASK in build_shared_lib_dbg) C_ARGS="-O0 -g -fpic -shared" CPP_ARGS="$C_ARGS" - LINK_LIBS="" LINKER_ARGS="-Wl,-soname,$SHARED_LIB_FILE" TASK_SCRIPT=cbuild/default_tasks/build_shared_lib.sh PRE_TASK_SCRIPT= diff --git a/default_tasks/build_exec.sh b/default_tasks/build_exec.sh index 2df894e..cc09b38 100755 --- a/default_tasks/build_exec.sh +++ b/default_tasks/build_exec.sh @@ -2,4 +2,4 @@ compile_c "$C_ARGS" "$SRC_C $TESTS_C" compile_cpp "$CPP_ARGS" "$SRC_CPP $TESTS_CPP" -link "$CPP_ARGS $LINKER_ARGS" "$EXEC_FILE" +link "$CPP_ARGS" "$EXEC_FILE" diff --git a/default_tasks/build_shared_lib.sh b/default_tasks/build_shared_lib.sh index 91ee693..3b66efc 100755 --- a/default_tasks/build_shared_lib.sh +++ b/default_tasks/build_shared_lib.sh @@ -2,4 +2,4 @@ compile_c "$C_ARGS" "$SRC_C" compile_cpp "$CPP_ARGS" "$SRC_CPP" -link "$CPP_ARGS $LINKER_ARGS" "$SHARED_LIB_FILE" +link "$CPP_ARGS" "$SHARED_LIB_FILE" diff --git a/functions.sh b/functions.sh index 9fbb887..336bb9a 100755 --- a/functions.sh +++ b/functions.sh @@ -60,8 +60,8 @@ function link { local objects="$(find $OBJDIR -name '*.o') $(find $OBJDIR -name '*.a')" printf "${BLUE}objects: ${GRAY}$objects\n" - local command="$CMP_CPP $args $(echo $objects | tr '\n' ' ') $LINK_LIBS -o $outfile" - printf "$command\e" + local command="$CMP_CPP $args $(echo $objects | tr '\n' ' ') $LINKER_ARGS -o $outfile" + printf "$command\n" if $command then printf "${GREEN}file $CYAN$outfile ${GREEN}created\n${GRAY}"