Skip to content

Commit

Permalink
Fix nightly not being applied after rebase
Browse files Browse the repository at this point in the history
  • Loading branch information
sosthene-nitrokey committed Apr 4, 2024
1 parent a12c9f1 commit 05c93e1
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions runners/embedded/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@ CUSTOM_PROFILE=$(shell python3 -c "p = 'release-thin-lto' if '$(BOARD)' == 'nk3a
NO_DELOG_FEATURE=$(shell python3 -c "print('no-delog') if 'no-delog' not in '$(FEATURES)'.split(',') and 'log-semihosting' not in '$(FEATURES)'.split(',') and 'log-rtt' not in '$(FEATURES)'.split(',') else None; ")

SHOULD_BUILD_STD=$(shell python3 -c "p = True if '$(BOARD)' == 'nk3xn' and 'test' in '$(FEATURES)'.split(',') else False; print(p)")
ifeq ($(SHOULD_BUILD_STD), "True")
BUILD_STD='-Zbuild-std=core,alloc,panic_abort -Zbuild-std-features=panic_immediate_abort'
TOOLCHAIN='RUSTUP_TOOLCHAIN=nightly-2024-04-01'
LITTLEFS_INTRINSICS_FEATURE='littlefs-software-intrinsics'
ifeq ($(SHOULD_BUILD_STD), True)
BUILD_STD=-Zbuild-std=core,alloc,panic_abort -Zbuild-std-features=panic_immediate_abort
export RUSTUP_TOOLCHAIN=nightly-2024-04-01
LITTLEFS_INTRINSICS_FEATURE=littlefs-software-intrinsics
endif

RAW_OUT = $(CARGO_TARGET_DIR)/$(TARGET)/$(CUSTOM_PROFILE)/$(SOC)_runner
Expand Down Expand Up @@ -113,7 +113,7 @@ build: build-banner check-var-BOARD check-var-SOC
cargo --version

# NRF52/test -> "release-thin-lto", use "release" otherwise
$(TOOLCHAIN) cargo build --target $(TARGET) \
cargo build --target $(TARGET) \
--features $(BUILD_FEATURES) \
$(BUILD_STD) \
--quiet --profile $(CUSTOM_PROFILE)
Expand Down

0 comments on commit 05c93e1

Please sign in to comment.