Skip to content

Commit 2ac6389

Browse files
committed
include TUNE_CC_ARGS in C flags
This is necessary to ensure the appropriate hard floating point arguments are passed when compiling for armv7.
1 parent 7b63989 commit 2ac6389

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

recipes-devtools/swift/swift-stdlib.bb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,10 @@ TARGET_LDFLAGS:append = " -w -fuse-ld=lld -L${STAGING_DIR_TARGET}/usr/lib/${TARG
3030

3131
SWIFT_CMAKE_TOOLCHAIN_FILE = "${WORKDIR}/linux-${SWIFT_TARGET_ARCH}-toolchain.cmake"
3232

33-
SWIFT_C_FLAGS = "-w -fuse-ld=lld -target ${SWIFT_TARGET_NAME} --sysroot ${STAGING_DIR_TARGET} -B${STAGING_DIR_TARGET}/usr/lib/${TARGET_SYS}/${SWIFT_GCC_VERSION} -L${STAGING_DIR_TARGET}/usr/lib/${TARGET_SYS}/${SWIFT_GCC_VERSION} -I${STAGING_DIR_TARGET}/usr/include ${EXTRA_INCLUDE_FLAGS}"
33+
SWIFT_C_FLAGS = "${TUNE_CCARGS} -w -fuse-ld=lld -target ${SWIFT_TARGET_NAME} --sysroot ${STAGING_DIR_TARGET} -B${STAGING_DIR_TARGET}/usr/lib/${TARGET_SYS}/${SWIFT_GCC_VERSION} -L${STAGING_DIR_TARGET}/usr/lib/${TARGET_SYS}/${SWIFT_GCC_VERSION} -I${STAGING_DIR_TARGET}/usr/include ${EXTRA_INCLUDE_FLAGS}"
3434
SWIFT_C_LINK_FLAGS = "-target ${SWIFT_TARGET_NAME} --sysroot ${STAGING_DIR_TARGET} ${EXTRA_INCLUDE_FLAGS}"
3535

36-
SWIFT_CXX_FLAGS = "${SWIFT_C_FLAGS} -B${STAGING_DIR_TARGET}/usr/lib"
36+
SWIFT_CXX_FLAGS = "${SWIFT_C_FLAGS}"
3737
SWIFT_CXX_LINK_FLAGS = "${SWIFT_C_LINK_FLAGS}"
3838

3939
do_fix_gcc_install_dir() {

0 commit comments

Comments
 (0)