Skip to content
Snippets Groups Projects
Commit e7cd2adb authored by Piotr Balcer's avatar Piotr Balcer
Browse files

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.
parent 92d2e592
No related branches found
No related tags found
No related merge requests found
...@@ -47,7 +47,7 @@ LDFLAGS = -Wl,-rpath=$(LIBDIR) -L$(LIBDIR) $(EXTRA_LDFLAGS) ...@@ -47,7 +47,7 @@ LDFLAGS = -Wl,-rpath=$(LIBDIR) -L$(LIBDIR) $(EXTRA_LDFLAGS)
INCS = -I$(INCDIR) -I. INCS = -I$(INCDIR) -I.
LINKER=$(CC) LINKER=$(CC)
ifeq ($(LANG), cpp) ifeq ($(COMPILE_LANG), cpp)
LINKER=$(CXX) LINKER=$(CXX)
endif endif
......
...@@ -33,7 +33,7 @@ PROGS = queue ...@@ -33,7 +33,7 @@ PROGS = queue
LIBS = -lpmemobj -lpmem -pthread LIBS = -lpmemobj -lpmem -pthread
LANG = cpp COMPILE_LANG = cpp
include ../../Makefile.inc include ../../Makefile.inc
queue: queue.o queue: queue.o
...@@ -128,7 +128,7 @@ CFLAGS += $(COMMON_FLAGS) ...@@ -128,7 +128,7 @@ CFLAGS += $(COMMON_FLAGS)
LDFLAGS = -Wl,--warn-common -Wl,--fatal-warnings $(EXTRA_LDFLAGS) LDFLAGS = -Wl,--warn-common -Wl,--fatal-warnings $(EXTRA_LDFLAGS)
LINKER=$(CC) LINKER=$(CC)
ifeq ($(LANG), cpp) ifeq ($(COMPILE_LANG), cpp)
LINKER=$(CXX) LINKER=$(CXX)
endif endif
......
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
# #
TARGET = obj_cpp_ptr TARGET = obj_cpp_ptr
OBJS = obj_cpp_ptr.o OBJS = obj_cpp_ptr.o
LANG = cpp COMPILE_LANG = cpp
LIBPMEM=y LIBPMEM=y
LIBPMEMOBJ=y LIBPMEMOBJ=y
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment