diff options
| author | Damien George <damien.p.george@gmail.com> | 2014-06-07 13:03:29 +0100 |
|---|---|---|
| committer | Damien George <damien.p.george@gmail.com> | 2014-06-07 13:03:29 +0100 |
| commit | a9b5248e185e709bed53137fdeca041b6bdef80d (patch) | |
| tree | 6cc41b2cb3355863a1ba8ea97f70e47a9838b6ea /py | |
| parent | dc931934b3b73d6bb1395afab1ac2ae083c4b556 (diff) | |
| parent | 8ffc02495fefcd3eaf71d15276136e9a90aee912 (diff) | |
| download | micropython-a9b5248e185e709bed53137fdeca041b6bdef80d.tar.gz micropython-a9b5248e185e709bed53137fdeca041b6bdef80d.zip | |
Merge pull request #672 from marcusva/makefile
toolchain fixes to enable cross compatibility
Diffstat (limited to 'py')
| -rw-r--r-- | py/mkenv.mk | 16 | ||||
| -rwxr-xr-x | py/py-version.sh | 2 |
2 files changed, 9 insertions, 9 deletions
diff --git a/py/mkenv.mk b/py/mkenv.mk index 4bc71edd78..b8dde807e8 100644 --- a/py/mkenv.mk +++ b/py/mkenv.mk @@ -42,14 +42,14 @@ ECHO = @echo CP = cp MKDIR = mkdir SED = sed -PYTHON = python - -AS = $(CROSS_COMPILE)as -CC = $(CROSS_COMPILE)gcc -LD = $(CROSS_COMPILE)ld -OBJCOPY = $(CROSS_COMPILE)objcopy -SIZE = $(CROSS_COMPILE)size -STRIP = $(CROSS_COMPILE)strip +PYTHON ?= python + +AS ?= $(CROSS_COMPILE)as +CC ?= $(CROSS_COMPILE)gcc +LD ?= $(CROSS_COMPILE)ld +OBJCOPY ?= $(CROSS_COMPILE)objcopy +SIZE ?= $(CROSS_COMPILE)size +STRIP ?= $(CROSS_COMPILE)strip all: .PHONY: all diff --git a/py/py-version.sh b/py/py-version.sh index 93b8d7a1fd..88c3ebb986 100755 --- a/py/py-version.sh +++ b/py/py-version.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh # Note: git describe doesn't work if no tag is available git_tag="$(git describe --dirty --always)" |