diff options
| author | midipix <writeonce@midipix.org> | 2021-06-05 14:14:32 +0000 |
|---|---|---|
| committer | midipix <writeonce@midipix.org> | 2021-06-05 15:09:32 +0000 |
| commit | ead0623068e897021510fa311622e571534cd5ef (patch) | |
| tree | 3987a667043b91350c26c50397c71be947c2324a /sofort | |
| parent | 2fea96f1b30be17a54dd3d86e25187dfb6d21721 (diff) | |
| download | bfirm-ead0623068e897021510fa311622e571534cd5ef.tar.bz2 bfirm-ead0623068e897021510fa311622e571534cd5ef.tar.xz | |
build system: ccenv_set_cc_{link_}switch_vars(): proper project-specific tests.
Diffstat (limited to 'sofort')
| -rw-r--r-- | sofort/ccenv/ccenv.sh | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sofort/ccenv/ccenv.sh b/sofort/ccenv/ccenv.sh index 583434a..eddbb68 100644 --- a/sofort/ccenv/ccenv.sh +++ b/sofort/ccenv/ccenv.sh @@ -1448,10 +1448,11 @@ ccenv_output_defs() ccenv_set_cc_switch_vars() { if [ -f $mb_project_dir/project/config/ccswitch.strs ]; then - ccenv_switch_vars=$(grep -v -e '^#' -e '^-Wl,' \ + ccenv_switch_vars=$(cat \ $mb_project_dir/sofort/ccenv/ccswitch.strs \ $mb_project_dir/project/config/ccswitch.strs \ - | sort -u) + | grep -v -e '^#' -e '^-Wl,' \ + | sort -u) else ccenv_switch_vars=$(grep -v -e '^#' -e '^-Wl,' \ $mb_project_dir/sofort/ccenv/ccswitch.strs \ @@ -1498,9 +1499,10 @@ ccenv_set_cc_linker_switch_vars() >> "$ccenv_mk" if [ -f $mb_project_dir/project/config/ccswitch.strs ]; then - ccenv_switch_vars=$(grep -e '^-Wl,' \ + ccenv_switch_vars=$(cat \ $mb_project_dir/sofort/ccenv/ccswitch.strs \ $mb_project_dir/project/config/ccswitch.strs \ + | grep -e '^-Wl,' \ | sort -u) else ccenv_switch_vars=$(grep -e '^-Wl,' \ |