Hardware
/
litex
mirror of https://github.com/enjoy-digital/litex.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1538 from jevinskie/jev/bug/mac-arm64-sim-module-build-fix 

Fix sim module build on MacOS arm64
This commit is contained in:
enjoy-digital 2022-12-16 10:58:06 +01:00 committed by GitHub
parent f007f812df e393f84799
commit d504639f1c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
litex/build/sim/core/Makefile
View File

@ -1,9 +1,15 @@
include variables.mak include variables.mak
UNAME_S := $(shell uname -s) UNAME_S := $(shell uname -s)
UNAME_M := $(shell uname -m)
ifeq ($(UNAME_S),Darwin) ifeq ($(UNAME_S),Darwin)
CFLAGS += -I/usr/local/include/ ifeq ($(UNAME_M),x86_64)
CFLAGS += -I/usr/local/include
LDFLAGS += -L/usr/local/lib LDFLAGS += -L/usr/local/lib
else
CFLAGS += -I/opt/homebrew/include
LDFLAGS += -L/opt/homebrew/lib
endif
LDFLAGS += -lpthread -ljson-c -lz -lm -lstdc++ -ldl -levent LDFLAGS += -lpthread -ljson-c -lz -lm -lstdc++ -ldl -levent
else else
CC ?= gcc CC ?= gcc

1
litex/build/sim/core/modules/gmii_ethernet/Makefile
View File

@ -4,6 +4,7 @@ UNAME_S := $(shell uname -s)
include $(SRC_DIR)/modules/rules.mak include $(SRC_DIR)/modules/rules.mak
CFLAGS += -I$(TAPCFG_DIRECTORY)/src/include CFLAGS += -I$(TAPCFG_DIRECTORY)/src/include
LDFLAGS += -lz
OBJS = $(MOD).o tapcfg.o taplog.o OBJS = $(MOD).o tapcfg.o taplog.o
$(MOD).so: $(OBJS) $(MOD).so: $(OBJS)

11
litex/build/sim/core/modules/rules.mak
View File

@ -1,9 +1,16 @@
CC ?= gcc CC ?= gcc
UNAME_S := $(shell uname -s) UNAME_S := $(shell uname -s)
UNAME_M := $(shell uname -m)
ifeq ($(UNAME_S),Darwin) ifeq ($(UNAME_S),Darwin)
CFLAGS += -I/usr/local/include/ ifeq ($(UNAME_M),x86_64)
LDFLAGS += -L/usr/local/lib -ljson-c CFLAGS += -I/usr/local/include
LDFLAGS += -L/usr/local/lib
else
CFLAGS += -I/opt/homebrew/include
LDFLAGS += -L/opt/homebrew/lib
endif
LDFLAGS += -ljson-c
CFLAGS += -Wall -O3 -ggdb -fPIC CFLAGS += -Wall -O3 -ggdb -fPIC
else else
CFLAGS += -Wall -O3 -ggdb -fPIC -Werror CFLAGS += -Wall -O3 -ggdb -fPIC -Werror

1
litex/build/sim/core/modules/xgmii_ethernet/Makefile
View File

@ -4,6 +4,7 @@ UNAME_S := $(shell uname -s)
include $(SRC_DIR)/modules/rules.mak include $(SRC_DIR)/modules/rules.mak
CFLAGS += -I$(TAPCFG_DIRECTORY)/src/include CFLAGS += -I$(TAPCFG_DIRECTORY)/src/include
LDFLAGS += -lz
OBJS = $(MOD).o tapcfg.o taplog.o OBJS = $(MOD).o tapcfg.o taplog.o
$(MOD).so: $(OBJS) $(MOD).so: $(OBJS)