summaryrefslogtreecommitdiffhomepage
path: root/sofort
diff options
context:
space:
mode:
authormidipix <writeonce@midipix.org>2021-06-05 14:14:32 +0000
committermidipix <writeonce@midipix.org>2021-06-05 15:11:52 +0000
commitbfa291c1b3bb4619c258b7c10d14a4a3261b27b5 (patch)
treed952c3f7bd7f96e5ae0e5c79cf215af49cbe7152 /sofort
parentf4f561aaa958f5351ec921baa45b7e3d53dddb1a (diff)
downloadpemagine-bfa291c1b3bb4619c258b7c10d14a4a3261b27b5.tar.bz2
pemagine-bfa291c1b3bb4619c258b7c10d14a4a3261b27b5.tar.xz
build system: ccenv_set_cc_{link_}switch_vars(): proper project-specific tests.
Diffstat (limited to 'sofort')
-rw-r--r--sofort/ccenv/ccenv.sh8
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,' \