Merge pull request #3760 from jcelerier/patch-1
[x-compile] Fix cross-compiling for AArch64 with lld
This commit is contained in:
@@ -38,11 +38,15 @@ include_directories(${LIBRARY_DIR} ${LIBRARY_DIR}/common)
|
|||||||
|
|
||||||
file(GLOB CommonSources ${LIBRARY_DIR}/common/*.c)
|
file(GLOB CommonSources ${LIBRARY_DIR}/common/*.c)
|
||||||
file(GLOB CompressSources ${LIBRARY_DIR}/compress/*.c)
|
file(GLOB CompressSources ${LIBRARY_DIR}/compress/*.c)
|
||||||
|
file(GLOB DecompressSources ${LIBRARY_DIR}/decompress/*.c)
|
||||||
if (MSVC)
|
if (MSVC)
|
||||||
file(GLOB DecompressSources ${LIBRARY_DIR}/decompress/*.c)
|
|
||||||
add_compile_options(-DZSTD_DISABLE_ASM)
|
add_compile_options(-DZSTD_DISABLE_ASM)
|
||||||
else ()
|
else ()
|
||||||
file(GLOB DecompressSources ${LIBRARY_DIR}/decompress/*.c ${LIBRARY_DIR}/decompress/*.S)
|
if(CMAKE_SYSTEM_PROCESSOR MATCHES "amd64.*|AMD64.*|x86_64.*|X86_64.*")
|
||||||
|
set(DecompressSources ${DecompressSources} ${LIBRARY_DIR}/decompress/huf_decompress_amd64.S)
|
||||||
|
else()
|
||||||
|
add_compile_options(-DZSTD_DISABLE_ASM)
|
||||||
|
endif()
|
||||||
endif ()
|
endif ()
|
||||||
file(GLOB DictBuilderSources ${LIBRARY_DIR}/dictBuilder/*.c)
|
file(GLOB DictBuilderSources ${LIBRARY_DIR}/dictBuilder/*.c)
|
||||||
file(GLOB DeprecatedSources ${LIBRARY_DIR}/deprecated/*.c)
|
file(GLOB DeprecatedSources ${LIBRARY_DIR}/deprecated/*.c)
|
||||||
|
|||||||
Reference in New Issue
Block a user