diff options
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")]}" |