sporq/kmk_firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make sure we use pipenv-provided Python within nested Make targets

Browse Source
This commit is contained in:
Josh Klar 2018-10-07 18:33:27 -07:00
parent 614f49759f
commit f9c19a19b4
No known key found for this signature in database
GPG Key ID: 220F99BD7DB7A99E
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Makefile
View File

@ -67,7 +67,7 @@ circuitpy-deps: .circuitpy-deps
micropython-deps: .micropython-deps micropython-deps: .micropython-deps
build/micropython/ports/unix/micropython: micropython-deps build/micropython/ports/unix/modules/.kmk_frozen build/micropython/ports/unix/micropython: micropython-deps build/micropython/ports/unix/modules/.kmk_frozen
@make -j4 -C build/micropython/ports/unix @pipenv run $(MAKE) -j4 -C build/micropython/ports/unix
micropython-build-unix: build/micropython/ports/unix/micropython micropython-build-unix: build/micropython/ports/unix/micropython
@ -121,15 +121,15 @@ micropython-freeze-kmk-stm32: freeze-stm32-build-deps
circuitpy-build-feather-m4-express: circuitpy-build-feather-m4-express:
@echo "===> Building CircuitPython" @echo "===> Building CircuitPython"
@make -C build/circuitpython/ports/atmel-samd BOARD=feather_m4_express FROZEN_MPY_DIRS="modules" clean all @pipenv run $(MAKE) -C build/circuitpython/ports/atmel-samd BOARD=feather_m4_express FROZEN_MPY_DIRS="modules" clean all
circuitpy-build-itsybitsy-m4-express: circuitpy-build-itsybitsy-m4-express:
@echo "===> Building CircuitPython" @echo "===> Building CircuitPython"
@make -C build/circuitpython/ports/atmel-samd BOARD=itsybitsy_m4_express FROZEN_MPY_DIRS="modules" clean all @pipenv run $(MAKE) -C build/circuitpython/ports/atmel-samd BOARD=itsybitsy_m4_express FROZEN_MPY_DIRS="modules" clean all
circuitpy-build-nrf: circuitpy-build-nrf:
@echo "===> Building CircuitPython" @echo "===> Building CircuitPython"
@make -C build/circuitpython/ports/nrf BOARD=feather_nrf52832 SERIAL=${AMPY_PORT} SD=s132 FROZEN_MPY_DIR=freeze clean all @pipenv run $(MAKE) -C build/circuitpython/ports/nrf BOARD=feather_nrf52832 SERIAL=${AMPY_PORT} SD=s132 FROZEN_MPY_DIR=freeze clean all
circuitpy-flash-feather-m4-express: circuitpy-flash-feather-m4-express:
@echo "Flashing not available for Feather M4 Express over bossa right now" @echo "Flashing not available for Feather M4 Express over bossa right now"
@ -150,10 +150,10 @@ circuitpy-flash-nrf: circuitpy-build-nrf
@make -C build/circuitpython/ports/nrf BOARD=feather_nrf52832 SERIAL=${AMPY_PORT} SD=s132 FROZEN_MPY_DIR=freeze dfu-gen dfu-flash @make -C build/circuitpython/ports/nrf BOARD=feather_nrf52832 SERIAL=${AMPY_PORT} SD=s132 FROZEN_MPY_DIR=freeze dfu-gen dfu-flash
micropython-build-pyboard: micropython-build-pyboard:
@make -j4 -C build/micropython/ports/stm32/ BOARD=PYBV11 FROZEN_MPY_DIR=freeze all @pipenv run $(MAKE) -j4 -C build/micropython/ports/stm32/ BOARD=PYBV11 FROZEN_MPY_DIR=freeze all
micropython-flash-pyboard: micropython-build-pyboard micropython-flash-pyboard: micropython-build-pyboard
@make -j4 -C build/micropython/ports/stm32/ BOARD=PYBV11 FROZEN_MPY_DIR=freeze deploy @pipenv run $(MAKE) -j4 -C build/micropython/ports/stm32/ BOARD=PYBV11 FROZEN_MPY_DIR=freeze deploy
circuitpy-flash-nrf-entrypoint: circuitpy-flash-nrf-entrypoint:
@echo "===> Flashing entrypoint if it doesn't already exist" @echo "===> Flashing entrypoint if it doesn't already exist"