hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

server/core/makefile: added -lmysqld to LDFLAGS so that the tests compile

Browse Source 
query_classifier/test/canonical_tests/Makefile: Added hint.o to link flags
This commit is contained in:
Markus Makela
2014-09-04 15:44:00 +03:00
parent d09c5adfc2
commit dfe2806e37
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
query_classifier/test/canonical_tests/Makefile
View File

@ -27,7 +27,7 @@ LDFLAGS=-L$(QUERY_CLASSIFIER_PATH) \
-Wl,-rpath,$(QUERY_CLASSIFIER_PATH) -Wl,-rpath,$(QUERY_CLASSIFIER_PATH)
LIBS=-lstdc++ -lpthread -lquery_classifier -lz -ldl -lssl -laio -lcrypt -lcrypto -lrt \ LIBS=-lstdc++ -lpthread -lquery_classifier -lz -ldl -lssl -laio -lcrypt -lcrypto -lrt \
-llog_manager $(UTILS_PATH)/skygw_utils.o $(CORE_PATH)/buffer.o $(CORE_PATH)/atomic.o $(CORE_PATH)/spinlock.o -llog_manager $(UTILS_PATH)/skygw_utils.o $(CORE_PATH)/buffer.o $(CORE_PATH)/atomic.o $(CORE_PATH)/spinlock.o $(CORE_PATH)/hint.o
CFLAGS=-g $(MYSQL_HEADERS) \ CFLAGS=-g $(MYSQL_HEADERS) \
-I$(QUERY_CLASSIFIER_PATH) \ -I$(QUERY_CLASSIFIER_PATH) \

2
server/core/test/makefile
View File

@ -19,7 +19,7 @@ LDFLAGS=-rdynamic -L$(LOGPATH) \
-Wl,-rpath,$(EMBEDDED_LIB) -Wl,-rpath,$(EMBEDDED_LIB)
LIBS= -lz -lm -lcrypt -lcrypto -ldl -laio -lrt -pthread -llog_manager \ LIBS= -lz -lm -lcrypt -lcrypto -ldl -laio -lrt -pthread -llog_manager \
-L../../inih/extra -linih -lssl -lstdc++ -L../../inih/extra -linih -lssl -lstdc++ -lmysqld
TESTS=testhash testspinlock testfilter testadminusers TESTS=testhash testspinlock testfilter testadminusers