djsundog
/
circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #672 from marcusva/makefile 

toolchain fixes to enable cross compatibility
This commit is contained in:
Damien George 2014-06-07 13:03:29 +01:00
parent dc931934b3 8ffc02495f
commit a9b5248e18
3 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
py/mkenv.mk
View File

@ -42,14 +42,14 @@ ECHO = @echo
CP = cp CP = cp
MKDIR = mkdir MKDIR = mkdir
SED = sed SED = sed
PYTHON = python PYTHON ?= python
AS = $(CROSS_COMPILE)as AS ?= $(CROSS_COMPILE)as
CC = $(CROSS_COMPILE)gcc CC ?= $(CROSS_COMPILE)gcc
LD = $(CROSS_COMPILE)ld LD ?= $(CROSS_COMPILE)ld
OBJCOPY = $(CROSS_COMPILE)objcopy OBJCOPY ?= $(CROSS_COMPILE)objcopy
SIZE = $(CROSS_COMPILE)size SIZE ?= $(CROSS_COMPILE)size
STRIP = $(CROSS_COMPILE)strip STRIP ?= $(CROSS_COMPILE)strip
all: all:
.PHONY: all .PHONY: all

2
py/py-version.sh
View File

@ -1,4 +1,4 @@
#!/bin/bash #!/bin/sh
# Note: git describe doesn't work if no tag is available # Note: git describe doesn't work if no tag is available
git_tag="$(git describe --dirty --always)" git_tag="$(git describe --dirty --always)"

5
unix/Makefile
View File

@ -48,7 +48,10 @@ ifeq ($(MICROPY_PY_FFI),1)
LIBFFI_LDFLAGS_MOD := $(shell pkg-config --libs libffi) LIBFFI_LDFLAGS_MOD := $(shell pkg-config --libs libffi)
LIBFFI_CFLAGS_MOD := $(shell pkg-config --cflags libffi) LIBFFI_CFLAGS_MOD := $(shell pkg-config --cflags libffi)
CFLAGS_MOD += $(LIBFFI_CFLAGS_MOD) -DMICROPY_PY_FFI=1 CFLAGS_MOD += $(LIBFFI_CFLAGS_MOD) -DMICROPY_PY_FFI=1
LDFLAGS_MOD += -ldl $(LIBFFI_LDFLAGS_MOD) ifeq ($(UNAME_S),Linux)
LDFLAGS_MOD += -ldl
endif
LDFLAGS_MOD += $(LIBFFI_LDFLAGS_MOD)
SRC_MOD += modffi.c SRC_MOD += modffi.c
endif endif