diff options
| author | Riccardo Spagni <ric@spagni.net> | 2016-01-03 20:02:44 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2016-01-03 20:02:44 +0200 |
| commit | 58dbc9d122b5274c8a67f0dc035efbb3943f7e5f (patch) | |
| tree | d48ef6831c2e40f0ea09734ed7862c7f5620aa7b /src/blocks/CMakeLists.txt | |
| parent | Merge pull request #595 (diff) | |
| parent | ARMv7 optimization flags are too aggressive (diff) | |
| download | monero-58dbc9d122b5274c8a67f0dc035efbb3943f7e5f.tar.xz | |
fixed conflicts
Diffstat (limited to 'src/blocks/CMakeLists.txt')
| -rw-r--r-- | src/blocks/CMakeLists.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/blocks/CMakeLists.txt b/src/blocks/CMakeLists.txt index b421d8bad..f65503fbc 100644 --- a/src/blocks/CMakeLists.txt +++ b/src/blocks/CMakeLists.txt @@ -30,8 +30,8 @@ if(APPLE) add_library(blocks STATIC blockexports.c) set_target_properties(blocks PROPERTIES LINKER_LANGUAGE C) else() - add_custom_command(OUTPUT blocks.o COMMAND cd ${CMAKE_CURRENT_SOURCE_DIR} && ld -r -b binary -o ${CMAKE_CURRENT_BINARY_DIR}/blocks.o blocks.dat) - add_custom_command(OUTPUT testnet_blocks.o COMMAND cd ${CMAKE_CURRENT_SOURCE_DIR} && ld -r -b binary -o ${CMAKE_CURRENT_BINARY_DIR}/testnet_blocks.o testnet_blocks.dat) + add_custom_command(OUTPUT blocks.o COMMAND cd ${CMAKE_CURRENT_SOURCE_DIR} && ${CMAKE_LINKER} -r -b binary -o ${CMAKE_CURRENT_BINARY_DIR}/blocks.o blocks.dat) + add_custom_command(OUTPUT testnet_blocks.o COMMAND cd ${CMAKE_CURRENT_SOURCE_DIR} && ${CMAKE_LINKER} -r -b binary -o ${CMAKE_CURRENT_BINARY_DIR}/testnet_blocks.o testnet_blocks.dat) add_library(blocks STATIC blocks.o testnet_blocks.o blockexports.c) set_target_properties(blocks PROPERTIES LINKER_LANGUAGE C) endif() |