From d83322a39de3dc9cd79e28a0b16718db54746902 Mon Sep 17 00:00:00 2001
From: midipix <writeonce@midipix.org>
Date: Jun 05 2021 15:11:55 +0000
Subject: build system: ccenv_set_cc_{link_}switch_vars(): proper project-specific tests.


---

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,'                \