Check for $(TOOLCHAIN) before checking for $(TOOLCHAIN)/bin
if TOOLCHAIN is blank, wildcard can still detect the `/bin` directory.
This commit is contained in:
parent
3b1cbc5861
commit
2783eed825
4 changed files with 8 additions and 0 deletions
2
Makefile
2
Makefile
|
@ -8,9 +8,11 @@ COMPARE ?= 0
|
|||
# files, or use arm-none-eabi binaries on the system
|
||||
# if dkP is not installed on tihs system
|
||||
|
||||
ifneq (,$(TOOLCHAIN))
|
||||
ifneq ($(wildcard $(TOOLCHAIN)/bin),)
|
||||
export PATH := $(TOOLCHAIN)/bin:$(PATH)
|
||||
endif
|
||||
endif
|
||||
|
||||
PREFIX := arm-none-eabi-
|
||||
OBJCOPY := $(PREFIX)objcopy
|
||||
|
|
|
@ -8,9 +8,11 @@ COMPARE ?= 0
|
|||
# files, or use arm-none-eabi binaries on the system
|
||||
# if dkP is not installed on tihs system
|
||||
|
||||
ifneq (,$(TOOLCHAIN))
|
||||
ifneq ($(wildcard $(TOOLCHAIN)/bin),)
|
||||
export PATH := $(TOOLCHAIN)/bin:$(PATH)
|
||||
endif
|
||||
endif
|
||||
|
||||
PREFIX := arm-none-eabi-
|
||||
OBJCOPY := $(PREFIX)objcopy
|
||||
|
|
|
@ -8,9 +8,11 @@ COMPARE ?= 0
|
|||
# files, or use arm-none-eabi binaries on the system
|
||||
# if dkP is not installed on tihs system
|
||||
|
||||
ifneq (,$(TOOLCHAIN))
|
||||
ifneq ($(wildcard $(TOOLCHAIN)/bin),)
|
||||
export PATH := $(TOOLCHAIN)/bin:$(PATH)
|
||||
endif
|
||||
endif
|
||||
|
||||
PREFIX := arm-none-eabi-
|
||||
OBJCOPY := $(PREFIX)objcopy
|
||||
|
|
|
@ -8,9 +8,11 @@ COMPARE ?= 0
|
|||
# files, or use arm-none-eabi binaries on the system
|
||||
# if dkP is not installed on tihs system
|
||||
|
||||
ifneq (,$(TOOLCHAIN))
|
||||
ifneq ($(wildcard $(TOOLCHAIN)/bin),)
|
||||
export PATH := $(TOOLCHAIN)/bin:$(PATH)
|
||||
endif
|
||||
endif
|
||||
|
||||
PREFIX := arm-none-eabi-
|
||||
OBJCOPY := $(PREFIX)objcopy
|
||||
|
|
Loading…
Reference in a new issue