From 378493a7c3c8fcdbce411bc9bb6b23221b3f724f Mon Sep 17 00:00:00 2001 From: DarthArgus Date: Wed, 2 May 2018 18:09:06 +0000 Subject: [PATCH] seems relax may not be supported by lld...may be to do some trickery to figure out the ld.gold vs lld situation --- CMakeLists.txt | 4 ++-- engine/client/application/Miff/CMakeLists.txt | 4 ---- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index bca84556..45250125 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -70,12 +70,12 @@ elseif (UNIX) # linker flags if (${CMAKE_BUILD_TYPE} STREQUAL "RELWITHDEBINFO" OR ${CMAKE_BUILD_TYPE} STREQUAL "MINSIZEREL") set(CMAKE_SHARED_LINKER_FLAGS "-Wl,-z,norelro,-O3,--sort-common,--as-needed,--relax,-z,combreloc,-z,global,--no-omagic") + set(CMAKE_EXE_LINKER_FLAGS "-Wl,-z,norelro,-O3,--sort-common,--as-needed,-z,combreloc,-z,global,--no-omagic") else () set(CMAKE_SHARED_LINKER_FLAGS "-Wl,-z,norelro,-O3,--sort-common,--as-needed,--relax,-z,combreloc,-z,global,--no-omagic,-x,-s") + set(CMAKE_EXE_LINKER_FLAGS "-Wl,-z,norelro,-O3,--sort-common,--as-needed,--relax,-z,combreloc,-z,global,--no-omagic,-x,-s") endif () - set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS}") - # don't put anything too crazy in debug...and any common flags go into CMAKE_CXX_FLAGS set(CMAKE_CXX_FLAGS_DEBUG "-D_DEBUG -DDEBUG_LEVEL=2 -DPRODUCTION=0 -O0 -g3") diff --git a/engine/client/application/Miff/CMakeLists.txt b/engine/client/application/Miff/CMakeLists.txt index 753d5243..59bd87d2 100644 --- a/engine/client/application/Miff/CMakeLists.txt +++ b/engine/client/application/Miff/CMakeLists.txt @@ -2,8 +2,4 @@ cmake_minimum_required(VERSION 2.8) project(Miff) -# todo: if you're running a windows build, comment this out -# windows sucks, I don't care -set(CMAKE_EXE_LINKER_FLAGS "-Wl,-z,norelro,-O3,--sort-common,--as-needed,-z,combreloc,-z,global,--no-omagic") - add_subdirectory(src)