Always compile jemalloc with cc

Author: renecannao

deps/Makefile

@@ -30,7 +30,7 @@ jemalloc/jemalloc/lib/libjemalloc.a:
 	cd jemalloc && rm -rf jemalloc-3.6.0
 	cd jemalloc && tar -jxf jemalloc-3.6.0.tar.bz2
 	cd jemalloc/jemalloc && ./configure --enable-xmalloc
-	cd jemalloc/jemalloc && CC=${CC} CXX=${CXX} ${MAKE}
+	cd jemalloc/jemalloc && CC=cc ${MAKE}
 
 jemalloc: jemalloc/jemalloc/lib/libjemalloc.a
 

include/proxysql_debug.h

@@ -15,13 +15,17 @@ extern int gdbg;
 #endif
 
 #ifdef DEBUG
+#ifdef HAVE_SYSCALL_H
 #define proxy_debug(module, verbosity, fmt, ...) \
 	do { if (GloVars.global.gdbg) { \
 	proxy_debug_func(module, verbosity, syscall(SYS_gettid), __FILE__, __LINE__, __func__ ,  fmt,  ## __VA_ARGS__); \
 	} } while (0)
 #else
 #define proxy_debug(module, verbosity, fmt, ...)
-#endif
+#endif /* HAVE_SYSCALL_H */
+#else
+#define proxy_debug(module, verbosity, fmt, ...)
+#endif /* DEBUG */
 
 #ifdef DEBUG
 #define proxy_error(fmt, ...) \

lib/Makefile.BSD

@@ -30,7 +30,7 @@ IDIRS=-I$(IDIR) -I$(JEMALLOC_IDIR) -I$(MARIADB_IDIR) $(LIBCONFIG_IDIR) -I$(RE2_I
 
 LDIRS=-L$(JEMALLOC_PATH)/lib -L$(RE2_PATH)/obj -L$(INJECTION_PATH)
 
-LIBS=-rdynamic -Wl,-Bstatic -ljemalloc_pic -lre2 -Wl,-Bdynamic -ldl -lpthread -lz -lrt -lc -lc++ -lstdc++ $(EXTRALINK)
+LIBS=-rdynamic -Wl,-Bstatic -ljemalloc_pic -lre2 -Wl,-Bdynamic -ldl -lpthread -lz -lrt -lc -lstdc++ $(EXTRALINK)
 
 ODIR= obj
 

src/Makefile

@@ -70,12 +70,12 @@ _OBJ = main.o proxysql_global.o
 OBJ = $(patsubst %,$(ODIR)/%,$(_OBJ))
 
 $(ODIR)/%.o: %.cpp
-	$(CC) -c -o $@ $< $(CFLAGS) -Wall
+	$(CXX) -c -o $@ $< $(CFLAGS) -Wall
 
 
 
 proxysql: $(ODIR) $(OBJ) $(LIBPROXYSQLAR)
-	$(CC) -o $@ $(OBJ) $(LIBPROXYSQLAR) $(CFLAGS) $(LDIRS) $(LIBS)
+	$(CXX) -o $@ $(OBJ) $(LIBPROXYSQLAR) $(CFLAGS) $(LDIRS) $(LIBS)
 
 $(ODIR):
 	mkdir $(ODIR)

src/Makefile.BSD

@@ -52,7 +52,7 @@ LDIRS=-L$(LDIR) -L$(JEMALLOC_LDIR) $(LIBCONFIG_LDIR) -L$(RE2_PATH)/obj -L$(INJEC
 
 
 CFLAGS=-std=c++11 -D_GLIBCXX_USE_C99 $(IDIRS) $(OPTZ) $(DEBUG)
-LIBS=-rdynamic -Wl,-Bstatic -lconfig -lproxysql -ldaemon -ljemalloc -lconfig++ -lre2 -linjection -levent -lmariadbclient -Wl,-Bdynamic -lpthread -lm -lz -lrt -lc -lc++ -lcrypto -lstdc++ -lssl -liconv -lexecinfo $(EXTRALINK)
+LIBS=-rdynamic -Wl,-Bstatic -lconfig -lproxysql -ldaemon -ljemalloc -lconfig++ -lre2 -linjection -levent -lmariadbclient -Wl,-Bdynamic -lpthread -lm -lz -lrt -lc -lcrypto -lstdc++ -lssl -liconv -lexecinfo $(EXTRALINK)
 #LIBS=-rdynamic -Wl,-Bstatic -lproxysql -ljemalloc -levent $(GLIB_LIB) -Wl,-Bdynamic -ldl -lpthread -lm -lz -lrt
 
 LIBPROXYSQLAR=$(LDIR)/libproxysql.a
@@ -70,12 +70,12 @@ _OBJ = main.o proxysql_global.o
 OBJ = $(patsubst %,$(ODIR)/%,$(_OBJ))
 
 $(ODIR)/%.o: %.cpp
-	$(CC) -c -o $@ $< $(CFLAGS) -Wall
+	$(CXX) -c -o $@ $< $(CFLAGS) -Wall
 
 
 
 proxysql: $(ODIR) $(OBJ) $(LIBPROXYSQLAR)
-	$(CC) -o $@ $(OBJ) $(LIBPROXYSQLAR) $(CFLAGS) $(LDIRS) $(LIBS)
+	$(CXX) -o $@ $(OBJ) $(LIBPROXYSQLAR) $(CFLAGS) $(LDIRS) $(LIBS)
 
 $(ODIR):
 	mkdir $(ODIR)