From b439835cd66dedff2b65ba2d3e6acbd2e80194b8 Mon Sep 17 00:00:00 2001
From: Kefu Chai <kchai@redhat.com>
Date: Thu, 2 Apr 2020 12:36:34 +0800
Subject: [PATCH] cmake: specify CC when compiling pmem

make always assume that `cc` is available. but we cannot ensure this,
and furthermore, we need to use the compiler specified by user. so
specify `CC` variable when compiling pmem. and reindent the code to fix
the formatting.

Signed-off-by: Kefu Chai <kchai@redhat.com>
---
 cmake/modules/Buildpmem.cmake | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/cmake/modules/Buildpmem.cmake b/cmake/modules/Buildpmem.cmake
index 81073271d3508..425d61ba5a872 100644
--- a/cmake/modules/Buildpmem.cmake
+++ b/cmake/modules/Buildpmem.cmake
@@ -23,26 +23,26 @@ function(build_pmem)
       # build system tests statically linking to librbd (which uses
       # libpmemobj) will not link (because we don't build the ndctl
       # static library here).
-      BUILD_COMMAND ${make_cmd} NDCTL_ENABLE=n
+      BUILD_COMMAND ${make_cmd} CC=${CMAKE_C_COMPILER} NDCTL_ENABLE=n
       BUILD_IN_SOURCE 1
       BUILD_BYPRODUCTS "${PMDK_LIB}/libpmem.a" "${PMDK_LIB}/libpmemobj.a"
       INSTALL_COMMAND "true")
 
-    # libpmem
-    add_library(pmem::pmem STATIC IMPORTED)
-    add_dependencies(pmem::pmem pmdk_ext)
-    file(MAKE_DIRECTORY ${PMDK_INCLUDE})
-    set_target_properties(pmem::pmem PROPERTIES
-      INTERFACE_INCLUDE_DIRECTORIES ${PMDK_INCLUDE}
-      IMPORTED_LOCATION "${PMDK_LIB}/libpmem.a"
-      INTERFACE_LINK_LIBRARIES ${CMAKE_THREAD_LIBS_INIT})
+  # libpmem
+  add_library(pmem::pmem STATIC IMPORTED)
+  add_dependencies(pmem::pmem pmdk_ext)
+  file(MAKE_DIRECTORY ${PMDK_INCLUDE})
+  set_target_properties(pmem::pmem PROPERTIES
+    INTERFACE_INCLUDE_DIRECTORIES ${PMDK_INCLUDE}
+    IMPORTED_LOCATION "${PMDK_LIB}/libpmem.a"
+    INTERFACE_LINK_LIBRARIES ${CMAKE_THREAD_LIBS_INIT})
 
-    # libpmemobj
-    add_library(pmem::pmemobj STATIC IMPORTED)
-    add_dependencies(pmem::pmemobj pmdk_ext)
-    set_target_properties(pmem::pmemobj PROPERTIES
-      INTERFACE_INCLUDE_DIRECTORIES ${PMDK_INCLUDE}
-      IMPORTED_LOCATION "${PMDK_LIB}/libpmemobj.a"
-      INTERFACE_LINK_LIBRARIES ${CMAKE_THREAD_LIBS_INIT})
+  # libpmemobj
+  add_library(pmem::pmemobj STATIC IMPORTED)
+  add_dependencies(pmem::pmemobj pmdk_ext)
+  set_target_properties(pmem::pmemobj PROPERTIES
+    INTERFACE_INCLUDE_DIRECTORIES ${PMDK_INCLUDE}
+    IMPORTED_LOCATION "${PMDK_LIB}/libpmemobj.a"
+    INTERFACE_LINK_LIBRARIES ${CMAKE_THREAD_LIBS_INIT})
 
 endfunction()
-- 
2.39.5