tf-a-tools: fix RPATH

Signed-off-by: Jose Quaresma <[email protected]>
foundriesio · Aug 24, 2022 · 58652f8 · 58652f8
1 parent 6394794
commit 58652f8
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/meta-lmp-bsp/dynamic-layers/stm-st-stm32mp/recipes-bsp/trusted-firmware-a/tf-a-tools_2.7.bb b/meta-lmp-bsp/dynamic-layers/stm-st-stm32mp/recipes-bsp/trusted-firmware-a/tf-a-tools_2.7.bb
@@ -14,11 +14,19 @@ COMPATIBLE_HOST:class-target = "null"
 
 S = "${WORKDIR}/git"
 
-EXTRA_OEMAKE += "V=1 OPENSSL_DIR='${STAGING_EXECPREFIXDIR}'"
+EXTRA_OEMAKE += "V=1 HOSTCC='${BUILD_CC}' OPENSSL_DIR='${STAGING_EXECPREFIXDIR}'"
 EXTRA_OEMAKE += "certtool fiptool"
 
 do_configure[noexec] = "1"
 
+do_compile:prepend () {
+    # This is still needed to have the native fiptool executing properly by
+    # setting the RPATH
+    sed -e '/^LDLIBS/ s,$, \$\{BUILD_LDFLAGS},' \
+        -e '/^INCLUDE_PATHS/ s,$, \$\{BUILD_CFLAGS},' \
+        -i ${S}/tools/fiptool/Makefile
+}
+
 do_install() {
     install -d ${D}${bindir}
     install -m 0755 \