Timerix/cbuild
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 4 Wiki Activity

removed LINK_LIBS

Browse Source
This commit is contained in:
timerix 2023-01-20 04:25:53 +06:00
parent 8d4a91f852
commit dd6253f636
4 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
default.config
View File

@ -25,7 +25,6 @@ case $TASK in
C_ARGS="-O2" C_ARGS="-O2"
CPP_ARGS="$C_ARGS" CPP_ARGS="$C_ARGS"
LINKER_ARGS="" LINKER_ARGS=""
LINK_LIBS=""
TASK_SCRIPT=cbuild/default_tasks/build_exec.sh TASK_SCRIPT=cbuild/default_tasks/build_exec.sh
PRE_TASK_SCRIPT= PRE_TASK_SCRIPT=
POST_TASK_SCRIPT= POST_TASK_SCRIPT=
@ -34,7 +33,6 @@ case $TASK in
C_ARGS="-O0 -g" C_ARGS="-O0 -g"
CPP_ARGS="$C_ARGS" CPP_ARGS="$C_ARGS"
LINKER_ARGS="" LINKER_ARGS=""
LINK_LIBS=""
TASK_SCRIPT=cbuild/default_tasks/build_exec.sh TASK_SCRIPT=cbuild/default_tasks/build_exec.sh
PRE_TASK_SCRIPT= PRE_TASK_SCRIPT=
POST_TASK_SCRIPT= POST_TASK_SCRIPT=
@ -42,7 +40,6 @@ case $TASK in
build_shared_lib) build_shared_lib)
C_ARGS="-O2 -fpic -flto -shared" C_ARGS="-O2 -fpic -flto -shared"
CPP_ARGS="$C_ARGS" CPP_ARGS="$C_ARGS"
LINK_LIBS=""
LINKER_ARGS="-Wl,-soname,$SHARED_LIB_FILE" LINKER_ARGS="-Wl,-soname,$SHARED_LIB_FILE"
TASK_SCRIPT=cbuild/default_tasks/build_shared_lib.sh TASK_SCRIPT=cbuild/default_tasks/build_shared_lib.sh
PRE_TASK_SCRIPT= PRE_TASK_SCRIPT=
@ -51,7 +48,6 @@ case $TASK in
build_shared_lib_dbg) build_shared_lib_dbg)
C_ARGS="-O0 -g -fpic -shared" C_ARGS="-O0 -g -fpic -shared"
CPP_ARGS="$C_ARGS" CPP_ARGS="$C_ARGS"
LINK_LIBS=""
LINKER_ARGS="-Wl,-soname,$SHARED_LIB_FILE" LINKER_ARGS="-Wl,-soname,$SHARED_LIB_FILE"
TASK_SCRIPT=cbuild/default_tasks/build_shared_lib.sh TASK_SCRIPT=cbuild/default_tasks/build_shared_lib.sh
PRE_TASK_SCRIPT= PRE_TASK_SCRIPT=

2
default_tasks/build_exec.sh
View File

@ -2,4 +2,4 @@
compile_c "$C_ARGS" "$SRC_C $TESTS_C" compile_c "$C_ARGS" "$SRC_C $TESTS_C"
compile_cpp "$CPP_ARGS" "$SRC_CPP $TESTS_CPP" compile_cpp "$CPP_ARGS" "$SRC_CPP $TESTS_CPP"
link "$CPP_ARGS $LINKER_ARGS" "$EXEC_FILE" link "$CPP_ARGS" "$EXEC_FILE"

2
default_tasks/build_shared_lib.sh
View File

@ -2,4 +2,4 @@
compile_c "$C_ARGS" "$SRC_C" compile_c "$C_ARGS" "$SRC_C"
compile_cpp "$CPP_ARGS" "$SRC_CPP" compile_cpp "$CPP_ARGS" "$SRC_CPP"
link "$CPP_ARGS $LINKER_ARGS" "$SHARED_LIB_FILE" link "$CPP_ARGS" "$SHARED_LIB_FILE"

4
functions.sh
View File

@ -60,8 +60,8 @@ function link {
local objects="$(find $OBJDIR -name '*.o') local objects="$(find $OBJDIR -name '*.o')
$(find $OBJDIR -name '*.a')" $(find $OBJDIR -name '*.a')"
printf "${BLUE}objects: ${GRAY}$objects\n" printf "${BLUE}objects: ${GRAY}$objects\n"
local command="$CMP_CPP $args $(echo $objects | tr '\n' ' ') $LINK_LIBS -o $outfile" local command="$CMP_CPP $args $(echo $objects | tr '\n' ' ') $LINKER_ARGS -o $outfile"
printf "$command\e" printf "$command\n"
if $command if $command
then then
printf "${GREEN}file $CYAN$outfile ${GREEN}created\n${GRAY}" printf "${GREEN}file $CYAN$outfile ${GREEN}created\n${GRAY}"