Skip to content

Commit 185ea24

Browse files
committed
Fix building on Solaris 10 x86_64 GCC 4.9.2
Prevent building x86_64 ASM from Solaris x86_64
1 parent dcf784a commit 185ea24

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

build/cmake/lib/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ file(GLOB DecompressSources ${LIBRARY_DIR}/decompress/*.c)
4242
if (MSVC)
4343
add_compile_options(-DZSTD_DISABLE_ASM)
4444
else ()
45-
if(CMAKE_SYSTEM_PROCESSOR MATCHES "amd64.*|AMD64.*|x86_64.*|X86_64.*")
45+
if(CMAKE_SYSTEM_PROCESSOR MATCHES "amd64.*|AMD64.*|x86_64.*|X86_64.*" AND NOT CMAKE_SYSTEM_NAME STREQUAL "SunOS")
4646
set(DecompressSources ${DecompressSources} ${LIBRARY_DIR}/decompress/huf_decompress_amd64.S)
4747
else()
4848
add_compile_options(-DZSTD_DISABLE_ASM)
@@ -64,7 +64,7 @@ if (ZSTD_BUILD_COMPRESSION)
6464
set(Headers ${Headers} ${CompressHeaders})
6565
endif()
6666
if (ZSTD_BUILD_DECOMPRESSION)
67-
set(Sources ${Sources} ${DecompressSources})
67+
set(Sources ${Sources} ${DecompressSources} ${DecompressASMSources})
6868
set(Headers ${Headers} ${DecompressHeaders})
6969
endif()
7070
if (ZSTD_BUILD_DICTBUILDER)

0 commit comments

Comments
 (0)