From e7cd2adbcd3e8c9aeac859c1eef5884f5879cea7 Mon Sep 17 00:00:00 2001 From: Piotr Balcer <piotr.balcer@intel.com> Date: Mon, 18 Jan 2016 11:29:51 +0100 Subject: [PATCH] common: change conflicting makefile variable Because tests and examples are now compiled and linked using both c and c++ compilers a special makefile variable was required to identify the language. It was named LANG - unfortunately that conflicts with locale settings, the new name is COMPILE_LANG. --- src/examples/Makefile.inc | 2 +- src/examples/libpmemobj/cpp/Makefile | 2 +- src/test/Makefile.inc | 2 +- src/test/obj_cpp_ptr/Makefile | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/examples/Makefile.inc b/src/examples/Makefile.inc index 0e1c3b02f..07dd42f98 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 1ab9ae8c3..a663d783f 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 dc76dd97d..a33bc3b4c 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 3b58a54c6..9e42ee913 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 -- GitLab