Skip to content

Commit 390ff01

Browse files
committed
Don't override FORTIFY_SOURCE when building Foundation
Overriding FORTIFY_SOURCE with lcl_maybe_fortify may cause clang module conflicts with consumers that do not override it identically. Not disabling FORTIFY_SOURCE should have minimal performance impact. [1] [1] https://zatoichi-engineer.github.io/2017/10/06/fortify-source.html
1 parent 470ade3 commit 390ff01

File tree

3 files changed

+0
-6
lines changed

3 files changed

+0
-6
lines changed

recipes-devtools/swift/swift-foundation-essentials.bb

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,6 @@ EXTRA_OECMAKE += "-D_SwiftCollections_SourceDIR=${WORKDIR}/swift-collections"
3333
EXTRA_OECMAKE += "-DSwiftFoundation_MODULE_TRIPLE=${SWIFT_TARGET_NAME}"
3434
EXTRA_OECMAKE += "-DSwiftSyntax_DIR=${WORKDIR}/swift-syntax/cmake/modules"
3535

36-
lcl_maybe_fortify="-D_FORTIFY_SOURCE=0"
37-
3836
# Ensure the right CPU is targeted
3937
cmake_do_generate_toolchain_file:append() {
4038
sed -i 's/set([ ]*CMAKE_SYSTEM_PROCESSOR .*[ ]*)/set(CMAKE_SYSTEM_PROCESSOR ${TARGET_CPU_NAME})/' ${WORKDIR}/toolchain.cmake

recipes-devtools/swift/swift-foundation-icu.bb

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@ TARGET_LDFLAGS += "-L${STAGING_DIR_TARGET}/usr/lib/swift/linux"
2323
EXTRA_OECMAKE += "-DENABLE_SWIFT=YES"
2424
EXTRA_OECMAKE += "-DBUILD_SHARED_LIBS=YES"
2525

26-
lcl_maybe_fortify="-D_FORTIFY_SOURCE=0"
27-
2826
# Ensure the right CPU is targeted
2927
cmake_do_generate_toolchain_file:append() {
3028
sed -i 's/set([ ]*CMAKE_SYSTEM_PROCESSOR .*[ ]*)/set(CMAKE_SYSTEM_PROCESSOR ${TARGET_CPU_NAME})/' ${WORKDIR}/toolchain.cmake

recipes-devtools/swift/swift-foundation.bb

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,6 @@ EXTRA_OECMAKE += "-DENABLE_TESTING=0"
4343
EXTRA_OECMAKE += "-DBUILD_SHARED_LIBS=YES"
4444
EXTRA_OECMAKE += "-DDISPATCH_INCLUDE_PATH=${STAGING_DIR_TARGET}/${includedir}"
4545

46-
lcl_maybe_fortify="-D_FORTIFY_SOURCE=0"
47-
4846
# Ensure the right CPU is targeted
4947
cmake_do_generate_toolchain_file:append() {
5048
sed -i 's/set([ ]*CMAKE_SYSTEM_PROCESSOR .*[ ]*)/set(CMAKE_SYSTEM_PROCESSOR ${TARGET_CPU_NAME})/' ${WORKDIR}/toolchain.cmake

0 commit comments

Comments
 (0)