blob: 40c5f8f5e52ce8cd1e134611dd9dc152d927754c (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
|
From f6af035d8cfee4a40a5d02349bf111c3af25432e Mon Sep 17 00:00:00 2001
From: "Yew, Chang Ching" <chang.ching.yew@intel.com>
Date: Thu, 12 Aug 2021 07:33:39 +0800
Subject: [PATCH] Fix compile issue with CMAKE_CXX_FLAGS setting
Appends new options to CMAKE_CXX_FLAGS
Upstream-Status: Submitted
innersource PR #193
Signed-off-by: Yew, Chang Ching <chang.ching.yew@intel.com>
---
cmake/CompileOptions.cmake | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/cmake/CompileOptions.cmake b/cmake/CompileOptions.cmake
index 2a941b10..97c3f47a 100644
--- a/cmake/CompileOptions.cmake
+++ b/cmake/CompileOptions.cmake
@@ -50,7 +50,7 @@ else()
add_compile_options("-fstack-protector-strong")
endif()
if(NOT MINGW)
- set(CMAKE_CXX_FLAGS "-z relro -z now -z noexecstack")
+ set(CMAKE_CXX_FLAGS "-z relro -z now -z noexecstack ${CMAKE_CXX_FLAGS}")
endif()
add_compile_options("-Wall")
if(ENABLE_WARNING_AS_ERROR)
--
2.32.0
|
