Browse Source

build: removed check for existance of PX4 subdirs

this prevents modules from initialising
mission-4.1.18
Andrew Tridgell 10 years ago
parent
commit
cf21cc8132
  1. 9
      mk/px4_targets.mk

9
mk/px4_targets.mk

@ -9,11 +9,6 @@ ifeq ($(wildcard $(PX4_ROOT)/nuttx-configs),) @@ -9,11 +9,6 @@ ifeq ($(wildcard $(PX4_ROOT)/nuttx-configs),)
PX4_ROOT := $(shell cd $(SKETCHBOOK)/$(PX4_ROOT) && pwd)
endif
# check it is a valid PX4Firmware tree
ifeq ($(wildcard $(PX4_ROOT)/nuttx-configs),)
$(error ERROR: PX4_ROOT not set correctly - no nuttx-configs directory found)
endif
ifneq ($(wildcard $(SKETCHBOOK)/modules/uavcan),)
UAVCAN_DIR=$(shell cd $(SKETCHBOOK)/modules/uavcan && pwd)/
endif
@ -28,10 +23,6 @@ ifeq ($(wildcard $(NUTTX_SRC)/configs),) @@ -28,10 +23,6 @@ ifeq ($(wildcard $(NUTTX_SRC)/configs),)
NUTTX_SRC := $(shell cd $(SKETCHBOOK)/$(NUTTX_SRC) && pwd)/
endif
ifeq ($(wildcard $(NUTTX_SRC)configs),)
$(error ERROR: NUTTX_SRC not set correctly - no configs directory found)
endif
NUTTX_GIT_VERSION := $(shell cd $(NUTTX_SRC) && git rev-parse HEAD | cut -c1-8)
PX4_GIT_VERSION := $(shell cd $(PX4_ROOT) && git rev-parse HEAD | cut -c1-8)

Loading…
Cancel
Save