toolchain: copy_toolchain_lib_root: clarify logic

copy_toolchain_lib_root has slightly different logic depending on the type
of library object: file or link. All actions related to links are not
relevant in case you are working with a file. Hence, try to increase clarity
by not executing unnecessary lines in the 'file' case.

Signed-off-by: Thomas De Schampheleire <thomas.de_schampheleire@nokia.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

diff --git a/toolchain/helpers.mk b/toolchain/helpers.mk
index 319fbd44190f0886351dee80b71b6aaafc060d09..0ec9da42f2732952a80a61a5e5f4e360ed309b20 100644 (file)
--- a/toolchain/helpers.mk
+++ b/toolchain/helpers.mk
@@ -17,19 +17,17 @@ copy_toolchain_lib_root = \
                mkdir -p $(TARGET_DIR)/$${DESTDIR}; \
                while true ; do \
                        LIBNAME=`basename $${LIBPATH}`; \
-                       LINKTARGET=`readlink $${LIBPATH}` ; \
                        rm -fr $(TARGET_DIR)/$${DESTDIR}/$${LIBNAME}; \
                        if test -h $${LIBPATH} ; then \
+                               LINKTARGET=`readlink $${LIBPATH}` ; \
                                ln -sf `basename $${LINKTARGET}` $(TARGET_DIR)/$${DESTDIR}/$${LIBNAME} ; \
+                               LIBPATH="`readlink -f $${LIBPATH}`"; \
                        elif test -f $${LIBPATH}; then \
                                $(INSTALL) -D -m0755 $${LIBPATH} $(TARGET_DIR)/$${DESTDIR}/$${LIBNAME}; \
+                               break ; \
                        else \
                                exit -1; \
                        fi; \
-                       if test -z "$${LINKTARGET}" ; then \
-                               break ; \
-                       fi ; \
-                       LIBPATH="`readlink -f $${LIBPATH}`"; \
                done; \
        done