diff options
| author | Damien George <damien.p.george@gmail.com> | 2020-02-11 13:29:25 +1100 |
|---|---|---|
| committer | Damien George <damien.p.george@gmail.com> | 2020-02-16 00:15:57 +1100 |
| commit | baf11f237b5d7104efc5a3ab89a50af779a6f9db (patch) | |
| tree | 09d807f1d88ac63f0c2defa968bb0b4267230740 | |
| parent | be92aacba3fab9f726428168b7c2e61e589ab2be (diff) | |
unix/Makefile: Remove old variant targets that are no longer needed.
To eliminate confusion about what targets to use when building.
| -rw-r--r-- | .travis.yml | 4 | ||||
| -rw-r--r-- | ports/unix/Makefile | 18 |
2 files changed, 2 insertions, 20 deletions
diff --git a/.travis.yml b/.travis.yml index c785eb47a..73938dbf5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -113,7 +113,7 @@ jobs: - make ${MAKEOPTS} -C mpy-cross - make ${MAKEOPTS} -C ports/unix MICROPY_FORCE_32BIT=1 submodules - make ${MAKEOPTS} -C ports/unix MICROPY_FORCE_32BIT=1 deplibs - - make ${MAKEOPTS} -C ports/unix MICROPY_FORCE_32BIT=1 coverage + - make ${MAKEOPTS} -C ports/unix MICROPY_FORCE_32BIT=1 VARIANT=coverage # run the main test suite - (cd tests && MICROPY_CPYTHON3=python3 MICROPY_MICROPYTHON=../ports/unix/micropython-coverage ./run-tests) - (cd tests && MICROPY_CPYTHON3=python3 MICROPY_MICROPYTHON=../ports/unix/micropython-coverage ./run-tests -d thread) @@ -186,7 +186,7 @@ jobs: - stage: test env: NAME="minimal unix port build and tests" script: - - make ${MAKEOPTS} -C ports/unix minimal + - make ${MAKEOPTS} -C ports/unix VARIANT=minimal - (cd tests && MICROPY_CPYTHON3=python3 MICROPY_MICROPYTHON=../ports/unix/micropython-minimal ./run-tests -e exception_chain -e self_type_check -e subclass_native_init -d basics) # windows port via mingw diff --git a/ports/unix/Makefile b/ports/unix/Makefile index 23ea6d1fe..948cdd0c4 100644 --- a/ports/unix/Makefile +++ b/ports/unix/Makefile @@ -221,24 +221,6 @@ test_gcov: test_full gcov -o $(BUILD)/py $(TOP)/py/*.c gcov -o $(BUILD)/extmod $(TOP)/extmod/*.c -# Maintain historical targets from pre-variant configurations. -fast: - $(MAKE) VARIANT=fast - -minimal: - $(MAKE) VARIANT=minimal - -nanbox: - $(MAKE) VARIANT=nanbox - -freedos: - $(MAKE) VARIANT=freedos - -coverage: - $(MAKE) VARIANT=coverage -coverage_test: - $(MAKE) VARIANT=coverage test_gcov - # Value of configure's --host= option (required for cross-compilation). # Deduce it from CROSS_COMPILE by default, but can be overridden. ifneq ($(CROSS_COMPILE),) |