miegl/b210-k7-fpga
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fpga: tools: RESOLVE_PATH checks for an empty path

Browse Source 
Original-commit: ffdce1c3fc229579b9d30afe489d2749c0c956ed
This commit is contained in:
Andrew Moch
2020-07-30 15:00:06 -05:00
committed by Wade Fife
parent 2eb71626fb
commit 77cadca8a9
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tools/make/viv_preamble.mak
+4 -4
View File
@@ -6,8 +6,8 @@
# Environment Setup # Environment Setup
# ------------------------------------------------------------------- # -------------------------------------------------------------------
ifeq ($(VIV_PLATFORM),Cygwin) ifeq ($(VIV_PLATFORM),Cygwin)
RESOLVE_PATH = $(subst \,/,$(shell cygpath -aw $(1))) RESOLVE_PATH = $(if $(1),$(subst \,/,$(shell cygpath -aw $(1))))
RESOLVE_PATHS = "$(foreach path,$(1),$(subst \,/,$(shell cygpath -aw $(abspath $(path)))))" RESOLVE_PATHS = "$(if $(1),$(foreach path,$(1),$(subst \,/,$(shell cygpath -aw $(abspath $(path))))))"
else else
RESOLVE_PATH = $(1) RESOLVE_PATH = $(1)
RESOLVE_PATHS = "$(1)" RESOLVE_PATHS = "$(1)"
@@ -18,8 +18,8 @@ endif
# ------------------------------------------------------------------- # -------------------------------------------------------------------
# Requirement: BASE_DIR must be defined # Requirement: BASE_DIR must be defined
TOOLS_DIR = $(abspath $(BASE_DIR)/../tools) TOOLS_DIR = $(abspath $(BASE_DIR)/../tools)
LIB_DIR = $(abspath $(BASE_DIR)/../lib) LIB_DIR = $(abspath $(BASE_DIR)/../lib)
SIMLIB_DIR = $(abspath $(BASE_DIR)/../sim) SIMLIB_DIR = $(abspath $(BASE_DIR)/../sim)
LIB_IP_DIR = $(abspath $(LIB_DIR)/ip) LIB_IP_DIR = $(abspath $(LIB_DIR)/ip)
HLS_IP_DIR = $(abspath $(LIB_DIR)/hls) HLS_IP_DIR = $(abspath $(LIB_DIR)/hls)