diff options
| author | Igor Kotrasinski <i.kotrasinsk@partner.samsung.com> | 2017-08-16 10:21:26 +0200 |
|---|---|---|
| committer | Igor Kotrasinski <i.kotrasinsk@partner.samsung.com> | 2017-08-17 13:47:28 +0200 |
| commit | 75ebd56f472760551fe27443d7c2779291acdc76 (patch) | |
| tree | b6e75dd9641e70818f11c43dcf166fe1d3b730c7 /src | |
| parent | b503a5ede7ce904296f14071ceae19dc3536637f (diff) | |
| download | key-manager-75ebd56f472760551fe27443d7c2779291acdc76.tar.gz key-manager-75ebd56f472760551fe27443d7c2779291acdc76.tar.bz2 key-manager-75ebd56f472760551fe27443d7c2779291acdc76.zip | |
Force PIE compilation flags in CMakeListssubmit/tizen_4.0/20170828.110004submit/tizen_4.0/20170828.100004submit/tizen/20170817.234357accepted/tizen/unified/20170818.083433accepted/tizen/4.0/unified/20170829.020247
Fixes ckm_tool executable not being PIE.
Change-Id: I5bfd915171cb0f9a9b6a17cc8fbec921c4bfb127
Signed-off-by: Igor Kotrasinski <i.kotrasinsk@partner.samsung.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/CMakeLists.txt | 10 | ||||
| -rw-r--r-- | src/manager/CMakeLists.txt | 2 |
2 files changed, 5 insertions, 7 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index a784d15b..2e7291c9 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -80,11 +80,10 @@ SET(KEY_MANAGER_SOURCES ${CYNARA_WRAPPER_PATH} ) -# -fPIE and -pie flag is added for ASLR SET_SOURCE_FILES_PROPERTIES( ${KEY_MANAGER_SOURCES} PROPERTIES - COMPILE_FLAGS "-D_GNU_SOURCE -fvisibility=hidden -fPIE") + COMPILE_FLAGS "-D_GNU_SOURCE -fvisibility=hidden") INCLUDE_DIRECTORIES(SYSTEM ${KEY_MANAGER_DEP_INCLUDE_DIRS} @@ -107,12 +106,11 @@ LINK_DIRECTORIES(${KEY_MANAGER_DEP_LIBRARY_DIRS}) ADD_EXECUTABLE(${TARGET_KEY_MANAGER} ${KEY_MANAGER_SOURCES}) -# pie flag is added for ASLR TARGET_LINK_LIBRARIES(${TARGET_KEY_MANAGER} ${CMAKE_THREAD_LIBS_INIT} ${KEY_MANAGER_DEP_LIBRARIES} ${TARGET_KEY_MANAGER_COMMON} - -ldl -pie + -ldl ) ################################################################################ @@ -156,7 +154,7 @@ ADD_LIBRARY(${TARGET_KEY_MANAGER_CLIENT} SHARED ${KEY_MANAGER_CLIENT_SOURCES}) SET_TARGET_PROPERTIES( ${TARGET_KEY_MANAGER_CLIENT} PROPERTIES - COMPILE_FLAGS "-D_GNU_SOURCE -fPIC -fvisibility=hidden -Wno-deprecated-declarations" + COMPILE_FLAGS "-D_GNU_SOURCE -fvisibility=hidden -Wno-deprecated-declarations" SOVERSION ${KEY_MANAGER_CLIENT_VERSION_MAJOR} VERSION ${KEY_MANAGER_CLIENT_VERSION} ) @@ -194,7 +192,7 @@ ADD_LIBRARY(${TARGET_KEY_MANAGER_CONTROL_CLIENT} SHARED ${KEY_MANAGER_CONTROL_CL SET_TARGET_PROPERTIES( ${TARGET_KEY_MANAGER_CONTROL_CLIENT} PROPERTIES - COMPILE_FLAGS "-D_GNU_SOURCE -fPIC -fvisibility=hidden -Wno-deprecated-declarations" + COMPILE_FLAGS "-D_GNU_SOURCE -fvisibility=hidden -Wno-deprecated-declarations" SOVERSION ${KEY_MANAGER_CONTROL_CLIENT_VERSION_MAJOR} VERSION ${KEY_MANAGER_CONTROL_CLIENT_VERSION} ) diff --git a/src/manager/CMakeLists.txt b/src/manager/CMakeLists.txt index f0770e1c..d07b817d 100644 --- a/src/manager/CMakeLists.txt +++ b/src/manager/CMakeLists.txt @@ -59,7 +59,7 @@ ADD_LIBRARY(${TARGET_KEY_MANAGER_COMMON} SHARED ${COMMON_SOURCES}) SET_TARGET_PROPERTIES( ${TARGET_KEY_MANAGER_COMMON} PROPERTIES - COMPILE_FLAGS "-D_GNU_SOURCE -fPIC -fvisibility=hidden" + COMPILE_FLAGS "-D_GNU_SOURCE -fvisibility=hidden" SOVERSION ${KEY_MANAGER_COMMON_VERSION_MAJOR} VERSION ${KEY_MANAGER_COMMON_VERSION} ) |