diff --git a/src/examples/Makefile.inc b/src/examples/Makefile.inc index 0e1c3b02f59a05600a2fe07175d0dbfa82921a85..07dd42f9897d6b95420ebdfa67f725c0a52db245 100644 --- a/src/examples/Makefile.inc +++ b/src/examples/Makefile.inc @@ -47,7 +47,7 @@ LDFLAGS = -Wl,-rpath=$(LIBDIR) -L$(LIBDIR) $(EXTRA_LDFLAGS) INCS = -I$(INCDIR) -I. LINKER=$(CC) -ifeq ($(LANG), cpp) +ifeq ($(COMPILE_LANG), cpp) LINKER=$(CXX) endif diff --git a/src/examples/libpmemobj/cpp/Makefile b/src/examples/libpmemobj/cpp/Makefile index 1ab9ae8c3ae72302c520e9179d57826c5fdf957c..a663d783fe3dfa878799d774a528869dc9fa019f 100644 --- a/src/examples/libpmemobj/cpp/Makefile +++ b/src/examples/libpmemobj/cpp/Makefile @@ -33,7 +33,7 @@ PROGS = queue LIBS = -lpmemobj -lpmem -pthread -LANG = cpp +COMPILE_LANG = cpp include ../../Makefile.inc queue: queue.o diff --git a/src/test/Makefile.inc b/src/test/Makefile.inc index dc76dd97da03595518b62086c0567a9824427ba2..a33bc3b4c98c2a18ac4b8b23fbbf09db66933099 100644 --- a/src/test/Makefile.inc +++ b/src/test/Makefile.inc @@ -128,7 +128,7 @@ CFLAGS += $(COMMON_FLAGS) LDFLAGS = -Wl,--warn-common -Wl,--fatal-warnings $(EXTRA_LDFLAGS) LINKER=$(CC) -ifeq ($(LANG), cpp) +ifeq ($(COMPILE_LANG), cpp) LINKER=$(CXX) endif diff --git a/src/test/obj_cpp_ptr/Makefile b/src/test/obj_cpp_ptr/Makefile index 3b58a54c632174219a0024b10b963072adab4705..9e42ee9136e02c9a6225d3feb7346c9363df9232 100644 --- a/src/test/obj_cpp_ptr/Makefile +++ b/src/test/obj_cpp_ptr/Makefile @@ -35,7 +35,7 @@ # TARGET = obj_cpp_ptr OBJS = obj_cpp_ptr.o -LANG = cpp +COMPILE_LANG = cpp LIBPMEM=y LIBPMEMOBJ=y