Merge remote-tracking branch 'upstream/master'
This commit is contained in:
commit
a3818f2d0c
1 changed files with 3 additions and 1 deletions
|
@ -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}
|
||||
|
|
Loading…
Add table
Reference in a new issue