Module: xenomai-forge
Branch: master
Commit: 36d31894044434e23aefc3ca03dd955abd82a480
URL:    
http://git.xenomai.org/?p=xenomai-forge.git;a=commit;h=36d31894044434e23aefc3ca03dd955abd82a480

Author: Gernot Hillier <gernot.hill...@siemens.com>
Date:   Tue Jan 28 12:43:16 2014 +0100

scripts/xeno-config: Fix "native" alias for --ldflags

This also fixes a syntax error ("==" instead of "=") in the previous
code.

Signed-off-by: Gernot Hillier <gernot.hill...@siemens.com>
[Jan: Folding syntax fix and extension to ldflags together]
Signed-off-by: Jan Kiszka <jan.kis...@siemens.com>

---

 scripts/xeno-config-cobalt.in  |    9 +++++----
 scripts/xeno-config-mercury.in |    9 +++++----
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/scripts/xeno-config-cobalt.in b/scripts/xeno-config-cobalt.in
index 69e741d..f8ce965 100644
--- a/scripts/xeno-config-cobalt.in
+++ b/scripts/xeno-config-cobalt.in
@@ -114,7 +114,11 @@ while test $# -gt 0; do
            shift
            ;;
        --skin=*)
-           skin_list="$skin_list `expr "$1" : '--skin=\(.*\)'`"
+           if [ "$1" = "--skin=native" ]; then
+               skin_list="$skin_list alchemy"
+            else
+               skin_list="$skin_list `expr "$1" : '--skin=\(.*\)'`"
+           fi
            ;;
        --posix|--cobalt|--vxworks|--psos|--alchemy)
            skin_list="$skin_list `expr "$1" : '--\(.*\)'`"
@@ -126,9 +130,6 @@ while test $# -gt 0; do
            fi
            cflags="$XENO_BASE_CFLAGS -I$XENO_INCLUDE_DIR/cobalt"
            for skin in $skin_list; do
-               if [ "$skin" == "native" ]; then
-                       skin="alchemy"
-               fi
                case "$skin" in
                    posix|cobalt)
                        ;;
diff --git a/scripts/xeno-config-mercury.in b/scripts/xeno-config-mercury.in
index b583571..3b9c1c9 100644
--- a/scripts/xeno-config-mercury.in
+++ b/scripts/xeno-config-mercury.in
@@ -93,7 +93,11 @@ while test $# -gt 0; do
            shift
            ;;
        --skin=*)
-           skin_list="$skin_list `expr "$1" : '--skin=\(.*\)'`"
+           if [ "$1" = "--skin=native" ]; then
+               skin_list="$skin_list alchemy"
+            else
+               skin_list="$skin_list `expr "$1" : '--skin=\(.*\)'`"
+           fi
            ;;
        --vxworks|--psos|--alchemy)
            skin_list="$skin_list `expr "$1" : '--\(.*\)'`"
@@ -105,9 +109,6 @@ while test $# -gt 0; do
            fi
            cflags="$XENO_BASE_CFLAGS"
            for skin in $skin_list; do
-               if [ "$skin" == "native" ]; then
-                       skin="alchemy"
-               fi
                case "$skin" in
                    vxworks|psos|alchemy)
                        cflags="$cflags -I$XENO_INCLUDE_DIR/$skin"


_______________________________________________
Xenomai-git mailing list
Xenomai-git@xenomai.org
http://www.xenomai.org/mailman/listinfo/xenomai-git

Reply via email to