diff options
| author | Lars-Peter Clausen <lars@metafoo.de> | 2010-01-30 14:51:22 +0000 |
|---|---|---|
| committer | Lars-Peter Clausen <lars@metafoo.de> | 2010-01-30 14:51:22 +0000 |
| commit | 93567fed7afcb645f32dd2a0b42ea8e027475800 (patch) | |
| tree | 8b9e43744b50cd4a0323f135adddaf8af8bdf14f | |
| parent | 060ffa70ee3663b90decaeabb9c7ea18ff7995ac (diff) | |
| download | upstream-93567fed7afcb645f32dd2a0b42ea8e027475800.tar.gz upstream-93567fed7afcb645f32dd2a0b42ea8e027475800.tar.bz2 upstream-93567fed7afcb645f32dd2a0b42ea8e027475800.zip | |
autotools.mk: Add libstdc++ quirk to libtool_fixup_libdir. Fixes build of packages which use libtool and link against packages which link against libstdc++
SVN-Revision: 19399
| -rw-r--r-- | include/autotools.mk | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/include/autotools.mk b/include/autotools.mk index 5d51d7a328..cd333577c1 100644 --- a/include/autotools.mk +++ b/include/autotools.mk @@ -22,9 +22,11 @@ update_libtool_ucxx=$(call replace,libtool,$(STAGING_DIR)/host/bin,$(CONFIGURE_P # prevent libtool from linking against host development libraries define libtool_fixup_libdir find $(1) -name '*.la' | $(XARGS) \ - $(SED) "s,\(^libdir='\| \|-L\|^dependency_libs='\)/usr/lib,\1$(STAGING_DIR)/usr/lib,g" + $(SED) "s,\(^libdir='\| \|-L\|^dependency_libs='\)/usr/lib,\1$(STAGING_DIR)/usr/lib,g" \ + -e "s,$(STAGING_DIR)/usr/lib/\(libstdc++\|libsupc++\).la,$(TOOLCHAIN_DIR)/usr/lib/\1.la,g" find $(2) -name '*.la' | $(XARGS) \ - $(SED) "s,\(^libdir='\| \|-L\|^dependency_libs='\)/usr/lib,\1$(STAGING_DIR)/usr/lib,g" + $(SED) "s,\(^libdir='\| \|-L\|^dependency_libs='\)/usr/lib,\1$(STAGING_DIR)/usr/lib,g" \ + -e "s,$(STAGING_DIR)/usr/lib/\(libstdc++\|libsupc++\).la,$(TOOLCHAIN_DIR)/usr/lib/\1.la,g" endef define remove_version_check |