diff options
| author | midipix <writeonce@midipix.org> | 2021-06-05 14:14:32 +0000 |
|---|---|---|
| committer | midipix <writeonce@midipix.org> | 2021-06-05 15:11:54 +0000 |
| commit | 99cee0473157477d1a6d1c0f1fc51f9fc790235f (patch) | |
| tree | 2971172ab7296f3d84b0e5dafe83e41adbf197b9 | |
| parent | c3fa0aaff9f66231cd13e841782a460953c32888 (diff) | |
| download | ptycon-99cee0473157477d1a6d1c0f1fc51f9fc790235f.tar.bz2 ptycon-99cee0473157477d1a6d1c0f1fc51f9fc790235f.tar.xz | |
build system: ccenv_set_cc_{link_}switch_vars(): proper project-specific tests.
| -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,' \ |