Changeset 18832

Timestamp:

03/24/12 16:10:17 (14 months ago)

Author:

BrainSlayer

Message:

use toolchain dir

File:

• src/router/Makefile.brcm26 (modified) (1 diff)

src/router/Makefile.brcm26

@@ -223 +223 @@
 optimize-lib:
         make -f Makefile.brcm26 lib.$(ARCH)-install
-        cp lib.$(ARCH)/pics/* $(TARGETDIR)/lib
-        cp lib.$(ARCH)/libgcc_s.so.1 $(TARGETDIR)/lib
-
-
         relink-lib.sh \
                 "$(ARCH)-linux-" \
-                "lib.$(ARCH)/libc_so.a" \
-                "lib.$(ARCH)/libc_so.a" \
+                "${shell $(ARCH)-linux-gcc -print-file-name=libc_so.a}" \
+                "${shell $(ARCH)-linux-gcc -print-file-name=libc_so.a}" \
                 "$(ARCH)-uclibc/target/lib/libc.so.0" \
                 -Wl,-init,__uClibc_init -Wl,-soname=libc.so.0 \
-                lib.$(ARCH)/libgcc_s.so.*
+                ${shell $(ARCH)-linux-gcc -print-file-name=libgcc_s.so.1}
 
         relink-lib.sh \
                 "$(ARCH)-linux-" \
-                "$(wildcard lib.$(ARCH)/libcrypt-*.so)" \
-                "lib.$(ARCH)/libcrypt_pic.a" \
+                "${shell $(ARCH)-linux-gcc -print-file-name=libcrypt.so}" \
+                "${shell $(ARCH)-linux-gcc -print-file-name=libcrypt_pic.a}" \
                 "$(ARCH)-uclibc/target/lib/libcrypt.so.0" \
-                lib.$(ARCH)/libgcc_s.so.* \
+                ${shell $(ARCH)-linux-gcc -print-file-name=libgcc_s.so.1} \
                 -Wl,-soname=libcrypt.so.0
 
         relink-lib.sh \
                 "$(ARCH)-linux-" \
-                "$(wildcard lib.$(ARCH)/libm-*.so)" \
-                "lib.$(ARCH)/libm_pic.a" \
+                "${shell $(ARCH)-linux-gcc -print-file-name=libm.so}" \
+                "${shell $(ARCH)-linux-gcc -print-file-name=libm_pic.a}" \
                 "$(ARCH)-uclibc/target/lib/libm.so.0" \
-                lib.$(ARCH)/libgcc_s.so.* \
-                -Wl,-soname=libm.so.0
+                ${shell $(ARCH)-linux-gcc -print-file-name=libgcc_s.so.1} \
+                -Wl,-soname=libm.so.0 
 
         relink-lib.sh \
                 "$(ARCH)-linux-" \
-                "$(wildcard lib.$(ARCH)/libpthread-*.so)" \
-                "lib.$(ARCH)/libpthread_so.a" \
+                "${shell $(ARCH)-linux-gcc -print-file-name=libpthread.so.0}" \
+                "${shell $(ARCH)-linux-gcc -print-file-name=libpthread_so.a}" \
                 "$(ARCH)-uclibc/target/lib/libpthread.so.0" \
                 -Wl,-z,nodelete,-z,initfirst,-init=__pthread_initialize_minimal_internal \
-                lib.$(ARCH)/libgcc_s.so.* \
+                ${shell $(ARCH)-linux-gcc -print-file-name=libgcc_s.so.1} \
                 -Wl,-soname=libpthread.so.0
+
+        cp ${shell $(ARCH)-linux-gcc -print-file-name=libgcc_s.so.1} $(ARCH)-uclibc/target/lib/libgcc_s.so.1 
 
 ifneq ($(CONFIG_NOOPT),y)