]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
cmake: pass compiler and linker down to zstd 14881/head
authorKefu Chai <kchai@redhat.com>
Sat, 29 Apr 2017 18:03:31 +0000 (02:03 +0800)
committerKefu Chai <kchai@redhat.com>
Mon, 1 May 2017 07:49:59 +0000 (15:49 +0800)
so it can respect the setting specfied by user.

Signed-off-by: Kefu Chai <kchai@redhat.com>
src/compressor/zstd/CMakeLists.txt

index 0332834e80c187d46a7c4e064f5637fd2652f33b..d9d2b6e560d3f7de863a21e8222f05dd7b076f1b 100644 (file)
@@ -6,8 +6,10 @@ set(ZSTD_C_FLAGS -fPIC -Wno-unused-variable -O3)
 include(ExternalProject)
 ExternalProject_Add(zstd_ext
   SOURCE_DIR ${CMAKE_SOURCE_DIR}/src/zstd/build/cmake
-  CMAKE_ARGS -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
+  CMAKE_ARGS -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
+             -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
              -DCMAKE_C_FLAGS=${ZSTD_C_FLAGS}
+             -DCMAKE_AR=${CMAKE_AR}
   BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/libzstd
   BUILD_COMMAND $(MAKE) libzstd_static
   INSTALL_COMMAND "true")