diff options
| author |   Khem Raj <raj.khem@gmail.com> | 2010-10-05 20:59:11 -0700 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2010-10-10 00:04:37 -0700 |
| commit | c6a86c6075bfba1c51fc9b85f941d1d530cb3db0 (patch) | |
| tree | d411374b0990b9396644ffb4930b1dc13460c305 /classes/cross.bbclass | |
| parent | 014bd3b53453233d7b63c7ac46ba9afe443a7498 (diff) | |
| download | openembedded-c6a86c6075bfba1c51fc9b85f941d1d530cb3db0.tar.gz | |
cross.bbclass,staging.bbclass,utils.bbclass: Make sure that .la munging is not done for libtool > 2.4
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Acked-by: Martin Jansa <Martin.Jansa@gmail.com>
Acked-by: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>
Acked-by: Koen Kooi <k-kooi@ti.com>
Diffstat (limited to 'classes/cross.bbclass')
| -rw-r--r-- | classes/cross.bbclass | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/classes/cross.bbclass b/classes/cross.bbclass index d3b27e6cf0..1a6d906780 100644 --- a/classes/cross.bbclass +++ b/classes/cross.bbclass @@ -74,8 +74,7 @@ sysroot_stage_all() { } # -# Cross .la files have more path issues we have to correct -SYSROOTEXTRALIBDIRSED = '-e "/^libdir=/s,.*,libdir=${STAGING_DIR_TARGET}${target_libdir},g" \ - -e "/^dependency_libs=/s,\([[:space:]']\)-L${STAGING_LIBDIR_NATIVE},,g" \ -' +# Cross .la files have more path issues we have to correct only for libtool < 2.4 +SYSROOTEXTRALIBDIRSED_OLD = " -e \"/^libdir=/s,.*,libdir=${STAGING_DIR_TARGET}${target_libdir},g\" -e \"/^dependency_libs=/s,\([[:space:]']\)-L${STAGING_LIBDIR_NATIVE},,g\"" +SYSROOTEXTRALIBDIRSED = "${@["${SYSROOTEXTRALIBDIRSED_OLD}",""][("${LIBTOOL_HAS_SYSROOT}" == "yes")]}" |