From fabb480fed1bd3cb9fb4ea535278188079df176a Mon Sep 17 00:00:00 2001 From: Kevin Day Date: Thu, 18 Jul 2019 23:08:30 -0500 Subject: [PATCH] Update: relocate the shared and static build paths to before the library arguments --- build/scripts/generate.sh | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/build/scripts/generate.sh b/build/scripts/generate.sh index 064037e..fb153ce 100644 --- a/build/scripts/generate.sh +++ b/build/scripts/generate.sh @@ -311,8 +311,8 @@ generate_operation_build(){ sources="$sources$path_c$i " done - echo $compiler $sources -shared -Wl,-soname,lib$name.so.$major -o ${path_build}libraries/shared/lib$name.so.$major.$minor.$micro $arguments $arguments_shared ${variables[$(generate_id flags_shared)]} ${variables[$(generate_id flags_library)]} - $compiler $sources -shared -Wl,-soname,lib$name.so.$major -o ${path_build}libraries/shared/lib$name.so.$major.$minor.$micro $arguments $arguments_shared ${variables[$(generate_id flags_shared)]} ${variables[$(generate_id flags_library)]} || failure=1 + echo $compiler $sources -shared -Wl,-soname,lib$name.so.$major -o ${path_build}libraries/shared/lib$name.so.$major.$minor.$micro $arguments_shared $arguments ${variables[$(generate_id flags_shared)]} ${variables[$(generate_id flags_library)]} + $compiler $sources -shared -Wl,-soname,lib$name.so.$major -o ${path_build}libraries/shared/lib$name.so.$major.$minor.$micro $arguments_shared $arguments ${variables[$(generate_id flags_shared)]} ${variables[$(generate_id flags_library)]} || failure=1 if [[ $failure == "" ]] ; then ln -vsf lib$name.so.$major.$minor.$micro ${path_build}libraries/shared/lib$name.so.$major || failure=1 @@ -332,8 +332,8 @@ generate_operation_build(){ sources="$sources$path_c$i " done - echo $compiler $sources -o ${path_build}programs/shared/$name $arguments $arguments_shared ${variables[$(generate_id flags_shared)]} ${variables[$(generate_id flags_program)]} - $compiler $sources -o ${path_build}programs/shared/$name $arguments $arguments_shared ${variables[$(generate_id flags_shared)]} ${variables[$(generate_id flags_program)]} || failure=1 + echo $compiler $sources -o ${path_build}programs/shared/$name $arguments_shared $arguments ${variables[$(generate_id flags_shared)]} ${variables[$(generate_id flags_program)]} + $compiler $sources -o ${path_build}programs/shared/$name $arguments_shared $arguments ${variables[$(generate_id flags_shared)]} ${variables[$(generate_id flags_program)]} || failure=1 fi fi @@ -343,8 +343,8 @@ generate_operation_build(){ for i in $sources_library ; do sources="$sources${path_build}objects/$i.o " - echo $compiler $path_c$i -c -static -o ${path_build}objects/$i.o $arguments $arguments_static ${variables[$(generate_id flags_static)]} ${variables[$(generate_id flags_library)]} - $compiler $path_c$i -c -static -o ${path_build}objects/$i.o $arguments $arguments_static ${variables[$(generate_id flags_static)]} ${variables[$(generate_id flags_library)]} || failure=1 + echo $compiler $path_c$i -c -static -o ${path_build}objects/$i.o $arguments_static $arguments ${variables[$(generate_id flags_static)]} ${variables[$(generate_id flags_library)]} + $compiler $path_c$i -c -static -o ${path_build}objects/$i.o $arguments_static $arguments ${variables[$(generate_id flags_static)]} ${variables[$(generate_id flags_library)]} || failure=1 if [[ $failure == "1" ]] ; then break; @@ -369,8 +369,8 @@ generate_operation_build(){ sources="$sources$path_c$i " done - echo $compiler -static -o ${path_build}programs/static/$name $sources $arguments $arguments_static ${variables[$(generate_id flags_static)]} ${variables[$(generate_id flags_program)]} - $compiler -static -o ${path_build}programs/static/$name $sources $arguments $arguments_static ${variables[$(generate_id flags_static)]} ${variables[$(generate_id flags_program)]} || failure=1 + echo $compiler -static -o ${path_build}programs/static/$name $sources $arguments_static $arguments ${variables[$(generate_id flags_static)]} ${variables[$(generate_id flags_program)]} + $compiler -static -o ${path_build}programs/static/$name $sources $arguments_static $arguments ${variables[$(generate_id flags_static)]} ${variables[$(generate_id flags_program)]} || failure=1 fi fi -- 1.8.3.1