diff options
| author | Riccardo Spagni <ric@spagni.net> | 2018-10-05 23:13:31 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2018-10-05 23:13:32 +0200 |
| commit | 79d46c4d551a9b1261801960095bf4d24967211a (patch) | |
| tree | 084c67e8d2f93ed6ee6fa5629e997d8f7d56ddda /CMakeLists.txt | |
| parent | Merge pull request #4495 (diff) | |
| parent | blocks: use auto-generated .c files instead of 'LD -r -b binary' (diff) | |
| download | monero-79d46c4d551a9b1261801960095bf4d24967211a.tar.xz | |
Merge pull request #4472
02d3ef7b blocks: use auto-generated .c files instead of 'LD -r -b binary' (xiphon)
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index c31c14350..829a7e96c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -180,6 +180,9 @@ set(PER_BLOCK_CHECKPOINT 1) if(PER_BLOCK_CHECKPOINT) add_definitions("-DPER_BLOCK_CHECKPOINT") + set(Blocks "blocks") +else() + set(Blocks "") endif() list(INSERT CMAKE_MODULE_PATH 0 @@ -655,12 +658,10 @@ else() add_linker_flag_if_supported(-Wl,-z,noexecstack noexecstack_SUPPORTED) if (noexecstack_SUPPORTED) set(LD_SECURITY_FLAGS "${LD_SECURITY_FLAGS} -Wl,-z,noexecstack") - set(LD_RAW_FLAGS ${LD_RAW_FLAGS} -z noexecstack) endif() add_linker_flag_if_supported(-Wl,-z,noexecheap noexecheap_SUPPORTED) if (noexecheap_SUPPORTED) set(LD_SECURITY_FLAGS "${LD_SECURITY_FLAGS} -Wl,-z,noexecheap") - set(LD_RAW_FLAGS ${LD_RAW_FLAGS} -z noexecheap) endif() # some windows linker bits |