Fix make all on MacOS

This commit is contained in:
Emanuele Cesena 2018-10-24 20:20:46 -07:00
parent fb93891685
commit 747e291c73
3 changed files with 11 additions and 2 deletions

1
.gitignore vendored
View File

@ -78,3 +78,4 @@ venv/
.project
.tags*
targets/*/docs/
main

View File

@ -16,7 +16,12 @@ src = $(wildcard pc/*.c) $(wildcard fido2/*.c) $(wildcard crypto/sha256/*.c) cry
obj = $(src:.c=.o) uECC.o
LIBCBOR = tinycbor/lib/libtinycbor.a
LDFLAGS = -Wl,--gc-sections $(LIBCBOR)
ifeq ($(shell uname -s),Darwin)
export LDFLAGS = -Wl,-dead_strip
else
export LDFLAGS = -Wl,--gc-sections
endif
LDFLAGS += $(LIBCBOR)
CFLAGS = -O2 -fdata-sections -ffunction-sections
INCLUDES = -I./tinycbor/src -I./crypto/sha256 -I./crypto/micro-ecc/ -Icrypto/tiny-AES-c/ -I./fido2/ -I./pc -I./fido2/extensions

View File

@ -53,8 +53,11 @@ Clone solo and build it
```bash
git clone https://github.com/SoloKeysSec/solo
cd solo/
make all
git submodules init
git submodules update
make all
```
This builds our FIDO 2.0 and the U2F authenticator, as well as making a virtualenv in venv/