mirror of
https://git.yoctoproject.org/meta-arm
synced 2026-10-15 17:27:09 +00:00
arm/fiptool: fix native linkage
The Makefiles in TF-A have changed since this recipe was last altered, and our BUILD_LDFLAGS are no longer being respected. This means the built objects don't have the correct RPATH, so they fail to run if the host doesn't have libcrypto.so.4 (from OpenSSL 4) installed. Pass all of our BUILD_* flags via HOSTCC*, and delete the now redundant sed operations. Signed-off-by: Ross Burton <ross.burton@arm.com> Signed-off-by: Jon Mason <jon.mason@arm.com>
This commit is contained in:
1 parent
fede80de4c
commit
ade09d3a60
1 file changed
+5
-6
@@ -17,14 +17,13 @@ DEPENDS += "openssl-native"
|
||||
|
||||
inherit native
|
||||
|
||||
EXTRA_OEMAKE = "V=1 HOSTCC='${BUILD_CC}' OPENSSL_DIR=${STAGING_DIR_NATIVE}/${prefix_native}"
|
||||
EXTRA_OEMAKE = "V=1 \
|
||||
HOSTCC='${BUILD_CC}' \
|
||||
HOSTCCFLAGS='${BUILD_CPPFLAGS} ${BUILD_CFLAGS}' \
|
||||
HOSTLDFLAGS='${BUILD_LDFLAGS}' \
|
||||
OPENSSL_DIR=${STAGING_DIR_NATIVE}/${prefix_native}"
|
||||
|
||||
do_compile () {
|
||||
# This is still needed to have the native fiptool executing properly by
|
||||
# setting the RPATH
|
||||
sed -i '/^LDOPTS/ s,$, \$\{BUILD_LDFLAGS},' ${S}/tools/fiptool/Makefile
|
||||
sed -i '/^INCLUDE_PATHS/ s,$, \$\{BUILD_CFLAGS},' ${S}/tools/fiptool/Makefile
|
||||
|
||||
oe_runmake fiptool
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user