diff options
| author | Marc Kleine-Budde <mkl@pengutronix.de> | 2009-11-10 11:33:45 +0100 |
|---|---|---|
| committer | Marc Kleine-Budde <mkl@pengutronix.de> | 2009-11-10 11:33:45 +0100 |
| commit | acab099dae5a3ddbb2e2acaa14e330f248dfe63f (patch) | |
| tree | 7c32c83d7531c9aee51be22aa356a89a8337daa9 | |
| parent | fb2214df0930ed07686ecda84309c1722ce95299 (diff) | |
| download | OSELAS.Toolchain-acab099dae5a3ddbb2e2acaa14e330f248dfe63f.tar.gz OSELAS.Toolchain-acab099dae5a3ddbb2e2acaa14e330f248dfe63f.tar.xz | |
[cross-gcc] second try to fix the libstdc++ linking problemOSELAS.Toolchain-1.99.3.6
In fact not everybody was happy, especially the ptxdist library
extraction magic, which doesn't like the way we linked the files.
This patch keeps the library in '$TARGET/lib' and just creates a link in
'$SYSROOT/usr/lib' to the library.
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
| -rw-r--r-- | rules/cross-gcc.make | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/rules/cross-gcc.make b/rules/cross-gcc.make index 1dc9fbf..0e28235 100644 --- a/rules/cross-gcc.make +++ b/rules/cross-gcc.make @@ -154,7 +154,8 @@ $(STATEDIR)/cross-gcc.install: $(CROSS_GCC_PATH) $(MAKE) install @cd "$(PTXCONF_SYSROOT_CROSS)/$(PTX_TOUPLE_TARGET)/lib"; \ - rel="$$($(ptx/abs2rel) "$${PWD}" "$(SYSROOT)/usr/lib")" && \ + dst="$(SYSROOT)/usr/lib"; \ + rel="$$($(ptx/abs2rel) "$${dst}" "$${PWD}")" && \ for file in \ libg2c.*so* \ libgcc_s.*so* \ @@ -167,18 +168,19 @@ $(STATEDIR)/cross-gcc.install: ; do \ [ \! -e "$${file}" ] && continue; \ \ + dst_file="$${dst}/$${file}"; \ rel_file="$${rel}/$${file}"; \ if [ -L "$${file}" ]; then \ - cp -vdpR "$${file}" "$${rel_file}"; \ + cp -vdpR "$${file}" "$${dst_file}"; \ else \ - mv -vf "$${file}" "$${rel_file}" && \ - ln -vfs "$${rel_file}" "$${file}"; \ + ln -vfs "$${rel_file}" "$${dst_file}"; \ fi || exit 1; \ done @find $(PTXCONF_SYSROOT_CROSS) -name "*.la" | while read la_file; do \ rm -v $${la_file}; \ done + @$(call touch) # ---------------------------------------------------------------------------- |