Merge pull request #5890 from janekmi/libpmem_CFLAGS_fix

common: fix libpmem CFLAGS
pmem · Oct 24, 2023 · 0dec972 · 0dec972
2 parents eb24429 + be8657f
commit 0dec972
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,7 +1,7 @@
  * Unreleased *
 
  This release:
- - ...
+ - Significantly reduces the libpmem's stack usage.
 
 Tue Aug 8 2023 Oksana Sałyk <oksana.salyk@intel.com>
 

diff --git a/src/Makefile.inc b/src/Makefile.inc
@@ -4,6 +4,9 @@
 # src/Makefile.inc -- common Makefile rules for PMDK
 #
 
+# Note: Please do not set CFLAGS before this file is included unless you do not
+# want to use default CFLAGS.
+
 TOP := $(dir $(lastword $(MAKEFILE_LIST)))..
 
 include $(TOP)/src/common.inc

diff --git a/src/libpmem/Makefile b/src/libpmem/Makefile
@@ -50,8 +50,6 @@ ifeq ($(OS_DIMM),ndctl)
 SOURCE +=\
  region_namespace_ndctl.c\
  numa_ndctl.c
-CFLAGS += $(LIBNDCTL_CFLAGS)
-LIBS += $(LIBNDCTL_LIBS)
 else
 SOURCE +=\
  region_namespace_none.c\
@@ -68,5 +66,5 @@ include ../Makefile.inc
 
 include $(PMEM2)/$(ARCH)/flags.inc
 
-CFLAGS += -I.
-LIBS += -pthread
+CFLAGS += -I. $(LIBNDCTL_CFLAGS)
+LIBS += -pthread $(LIBNDCTL_LIBS)