Merge remote-tracking branch 'upstream/master'

This commit is contained in:
John Törnblom 2012-09-04 11:06:14 +02:00
commit a3818f2d0c

View file

@ -388,7 +388,9 @@ ROOTDIR ?= ${ROOTDIR}
BUILDDIR ?= ${ROOTDIR}/build.${PLATFORM}
OSENV ?= ${OSENV}
ARCH ?= ${ARCH}
CC ?= ${CC}
ifeq ($(origin CC),default)
CC = ${CC}
endif
PYTHON ?= ${PYTHON}
CFLAGS += ${CFLAGS}
LDFLAGS += ${LDFLAGS}