Skip to content

Commit 5c5f2ee

Browse files
wangrong1069deepin-bot[bot]
authored andcommitted
chore: Update compiler flags for security enhancements
As title Log: Update compiler flags for security enhancements Bug: https://pms.uniontech.com/bug-view-337059.html
1 parent 3f626be commit 5c5f2ee

File tree

6 files changed

+5
-29
lines changed

6 files changed

+5
-29
lines changed

CMakeLists.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,10 @@ else()
3131
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -O2 -Wl,--gc-sections")
3232
endif()
3333

34+
#安全加固编译参数
35+
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wl,-z,relro -Wl,-z,now -Wl,-z,noexecstack -pie -fstack-protector-all")
36+
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wl,-z,relro -Wl,-z,now -Wl,-z,noexecstack -pie -fstack-protector-all")
37+
3438
#判断龙芯架构
3539
if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "mips64")
3640
SET(IS_LOONGARCH_TYPE 1)

deepin-system-monitor-daemon/CMakeLists.txt

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,6 @@ target_link_libraries(${BIN_NAME} PRIVATE
5050
${DTK_NS}::Core
5151
)
5252

53-
#安全测试加固编译参数
54-
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -z relro -z now -z noexecstack -pie")
55-
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -z relro -z now -z noexecstack -pie")
56-
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fstack-protector-all")
57-
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fstack-protector-all")
5853
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -Wl,-Map=deepin-system-monitor-daemon.map")
5954
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -Wl,-Map=deepin-system-monitor-daemon.map")
6055

deepin-system-monitor-main/CMakeLists.txt

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -63,11 +63,6 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/libsmartcols/src)
6363
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../)
6464
#include_directories(${DFrameworkDBus_INCLUDE_DIRS}) # chinalife
6565

66-
#安全测试加固编译参数
67-
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -z relro -z now -z noexecstack -pie")
68-
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -z relro -z now -z noexecstack -pie")
69-
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fstack-protector-all")
70-
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fstack-protector-all")
7166
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -Wl,-Map=deepin-system-monitor-main.map")
7267
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -Wl,-Map=deepin-system-monitor-main.map")
7368

deepin-system-monitor-plugin-popup/CMakeLists.txt

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,7 @@ set(APP_RESOURCES ${APP_RES_ROOT}/${PROJECT_NAME}.qrc)
1212
set(CMAKE_CXX_STANDARD 17)
1313
set(CMAKE_CXX_STANDARD_REQUIRED True)
1414

15-
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall ")
16-
set(CMAKE_CXX_FLAGS "-Wl,--as-needed -fPIE")
17-
set(CMAKE_EXE_LINKER_FLAGS "-pie")
15+
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wl,--as-needed -fPIE")
1816

1917
set(MAIN_APP_DIR ${CMAKE_SOURCE_DIR}/deepin-system-monitor-main)
2018

@@ -40,11 +38,6 @@ find_library(LIB_XEXT NAMES Xext REQUIRED)
4038
find_library(LIB_ICCCM NAMES xcb-icccm REQUIRED)
4139
find_package(ICU COMPONENTS i18n uc REQUIRED)
4240

43-
#安全测试加固编译参数
44-
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -z relro -z now -z noexecstack -pie")
45-
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -z relro -z now -z noexecstack -pie")
46-
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fstack-protector-all")
47-
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fstack-protector-all")
4841
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -Wl,-Map=deepin-system-monitor-pluign-popup.map")
4942
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -Wl,-Map=deepin-system-monitor-popup.map")
5043

deepin-system-monitor-plugin/CMakeLists.txt

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,6 @@ target_link_libraries(${PROJECT_NAME} PRIVATE
4545
${DTK_NS}::Widget
4646
)
4747

48-
# 安全测试加固编译参数
49-
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -z relro -z now -z noexecstack -pie")
50-
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -z relro -z now -z noexecstack -pie")
51-
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fstack-protector-all")
52-
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fstack-protector-all")
5348
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -Wl,-Map=deepin-system-monitor-plugin.map")
5449
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -Wl,-Map=deepin-system-monitor-plugin.map")
5550

tests/CMakeLists.txt

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,6 @@ set(POLICY_FILE com.deepin.pkexec.${PROJECT_NAME}.policy)
2828
set(CMAKE_CXX_STANDARD 17)
2929
set(CMAKE_CXX_STANDARD_REQUIRED True)
3030

31-
32-
#安全测试加固编译参数
33-
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -z relro -z now -z noexecstack -pie")
34-
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -z relro -z now -z noexecstack -pie")
35-
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fstack-protector-all")
36-
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fstack-protector-all")
3731
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -Wl,-Map=deepin-system-monitor-test.map")
3832
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -Wl,-Map=deepin-system-monitor-test.map")
3933

0 commit comments

Comments
 (0)