mirror of
https://github.com/RIOT-OS/RIOT.git
synced 2025-12-26 06:53:52 +01:00
cpu/nrf5x_common: fix vendor header regression
When not using the Rust version of Git-Cache, the build system clones the full NRFX repository which led to errors during the build process due to duplicated headers and headers not found where they were expected.
This commit is contained in:
parent
9334926a1a
commit
89031c45fb
@ -21,14 +21,12 @@ else ifeq (nrf52, $(CPU_FAM))
|
||||
|
||||
PKG_SPARSE_PATHS += mdk/nrf52811.h
|
||||
PKG_SPARSE_PATHS += mdk/nrf52811_bitfields.h
|
||||
PKG_SPARSE_PATHS += mdk/nrf52811_name_change.h
|
||||
PKG_SPARSE_PATHS += mdk/nrf52811_peripherals.h
|
||||
|
||||
PKG_SPARSE_PATHS += mdk/nrf52832_peripherals.h
|
||||
|
||||
PKG_SPARSE_PATHS += mdk/nrf52833.h
|
||||
PKG_SPARSE_PATHS += mdk/nrf52833_bitfields.h
|
||||
PKG_SPARSE_PATHS += mdk/nrf52833_name_change.h
|
||||
PKG_SPARSE_PATHS += mdk/nrf52833_peripherals.h
|
||||
|
||||
PKG_SPARSE_PATHS += mdk/nrf52840.h
|
||||
@ -48,13 +46,23 @@ else ifneq (nrf53%, $(CPU_FAM))
|
||||
|
||||
endif
|
||||
|
||||
PKG_SOURCE_DIR = $(BUILD_DIR)/nrf5x_nrfx_mdk/$(CPU_FAM)
|
||||
PKG_PATCH_DIR = $(RIOTCPU)/nrf5x_common/include/vendor/patches/$(CPU_FAM)
|
||||
# The rust implementation of git-cache is the only one doing
|
||||
# a sparse checkout. The others do a full clone, which we need to
|
||||
# consider here.
|
||||
ifneq (,$(GIT_CACHE_RS))
|
||||
PKG_SOURCE_DIR = $(BUILD_DIR)/nrf5x_nrfx_mdk/$(CPU_FAM)
|
||||
VENDOR_FOLDER = $(PKG_SOURCE_DIR)/vendor
|
||||
else
|
||||
PKG_SOURCE_DIR = $(BUILD_DIR)/nrf5x_nrfx_mdk
|
||||
VENDOR_FOLDER = $(PKG_SOURCE_DIR)/$(CPU_FAM)/vendor
|
||||
endif
|
||||
|
||||
PKG_PATCH_DIR = $(RIOTCPU)/nrf5x_common/include/vendor/patches
|
||||
|
||||
include $(RIOTBASE)/pkg/pkg.mk
|
||||
|
||||
# The sparse checkout keeps the path, but we need to have the header in a
|
||||
# The sparse checkout keeps the path, but we need to have the headers in a
|
||||
# subfolder called "vendor".
|
||||
all:
|
||||
@mkdir -p $(PKG_SOURCE_DIR)/vendor
|
||||
@cp $(PKG_SOURCE_DIR)/mdk/* $(PKG_SOURCE_DIR)/vendor
|
||||
@mkdir -p $(VENDOR_FOLDER)
|
||||
@cp $(addprefix $(PKG_SOURCE_DIR)/, $(PKG_SPARSE_PATHS)) $(VENDOR_FOLDER)
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user