Skip to content

Commit 278347f

Browse files
xtremekforeverlhoward
authored andcommitted
fix do_fix_gcc_install_dir typos
- SWIFT_TARGET_ARCH cannot be used since the arch in the sysroot may likely be different. - Looks like pointing to `-oe-linux` was another typo as well in swift.bbclass.
1 parent ddba886 commit 278347f

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

classes/swift.bbclass

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ SWIFT_TARGET_ARCH = "${@oe.utils.conditional('TARGET_ARCH', 'arm', 'armv7', 'aar
2626
do_fix_gcc_install_dir() {
2727
# symbolic links do not work, will not be found by Swift clang driver
2828
# this is necessary to make the libstdc++ location heuristic work, necessary for C++ interop
29-
(cd ${STAGING_DIR_TARGET}/usr/lib && rm -rf gcc && mkdir -p gcc && cp -rp ${SWIFT_TARGET_ARCH}-oe-linux gcc)
29+
(cd ${STAGING_DIR_TARGET}/usr/lib && rm -rf gcc && mkdir -p gcc && cp -rp ${TARGET_ARCH}${TARGET_VENDOR}-${TARGET_OS} gcc)
3030
}
3131

3232
addtask fix_gcc_install_dir before do_configure after do_prepare_recipe_sysroot

0 commit comments

Comments
 (0)