Tests, fixes on third platform. (#1168)

MT linkage fix mainly.

Backports commit 72f759838774d1fa23de901c9b236d726e4ad5e4 from unicorn
This commit is contained in:
David CARLIER 2020-01-14 09:45:48 -05:00 committed by Lioncash
parent c206e37963
commit dd47649a3b
3 changed files with 7 additions and 3 deletions

View file

@ -1,8 +1,9 @@
CFLAGS += -L ../../ -I ../../include CFLAGS += -L ../../ -I ../../include
UNAME_S := $(shell uname -s) UNAME_S := $(shell uname -s)
LDFLAGS += -pthread
ifeq ($(UNAME_S), Linux) ifeq ($(UNAME_S), Linux)
LDFLAGS += -lrt -pthread LDFLAGS += -lrt
endif endif
LDFLAGS += -lunicorn LDFLAGS += -lunicorn

View file

@ -3,8 +3,9 @@ CFLAGS += -D__USE_MINGW_ANSI_STDIO=1
LDLIBS += -L../../ -lm -lunicorn LDLIBS += -L../../ -lm -lunicorn
UNAME_S := $(shell uname -s) UNAME_S := $(shell uname -s)
LDLIBS += -pthread
ifeq ($(UNAME_S), Linux) ifeq ($(UNAME_S), Linux)
LDLIBS += -lrt -pthread LDLIBS += -lrt
endif endif
EXECUTE_VARS = LD_LIBRARY_PATH=../../cmocka/src:../../ DYLD_LIBRARY_PATH=../../ EXECUTE_VARS = LD_LIBRARY_PATH=../../cmocka/src:../../ DYLD_LIBRARY_PATH=../../

View file

@ -2,12 +2,14 @@ CFLAGS += -Wall -Werror -Wno-unused-function -g
CFLAGS += -D__USE_MINGW_ANSI_STDIO=1 CFLAGS += -D__USE_MINGW_ANSI_STDIO=1
CFLAGS += -L ../../ -I ../../include CFLAGS += -L ../../ -I ../../include
CFLAGS += -L ../../cmocka/src -I ../../cmocka/include CFLAGS += -L ../../cmocka/src -I ../../cmocka/include
CFLAGS += -L /usr/local/lib -I /usr/local/include
ASFLAGS += --32 ASFLAGS += --32
OBJCOPY = objcopy OBJCOPY = objcopy
UNAME_S := $(shell uname -s) UNAME_S := $(shell uname -s)
LDLIBS += -pthread
ifeq ($(UNAME_S), Linux) ifeq ($(UNAME_S), Linux)
LDLIBS += -lrt -pthread LDLIBS += -lrt
else ifeq ($(UNAME_S), Darwin) else ifeq ($(UNAME_S), Darwin)
OBJCOPY = gobjcopy OBJCOPY = gobjcopy
ASFLAGS = -arch i386 ASFLAGS = -arch i386