summaryrefslogtreecommitdiffhomepage
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:49 +0000
commit7e080a79001e0645f3057f875b7358231b4c0f44 (patch)
treef5fbef3f348491d18dab56e0fa677b381c3c404f
parentf0122c4b97d0e0a1c59cf0dcc14e6ea124b6b2d6 (diff)
downloadntapi-7e080a79001e0645f3057f875b7358231b4c0f44.tar.bz2
ntapi-7e080a79001e0645f3057f875b7358231b4c0f44.tar.xz
build system: ccenv_set_cc_{link_}switch_vars(): proper project-specific tests.
-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,' \