From ffdce1c3fc229579b9d30afe489d2749c0c956ed Mon Sep 17 00:00:00 2001
From: Andrew Moch <Andrew.Moch@ni.com>
Date: Wed, 29 Jul 2020 16:07:10 +0100
Subject: fpga: tools: RESOLVE_PATH checks for an empty path

---
 fpga/usrp3/tools/make/viv_preamble.mak | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'fpga/usrp3/tools')

diff --git a/fpga/usrp3/tools/make/viv_preamble.mak b/fpga/usrp3/tools/make/viv_preamble.mak
index 208858757..87115934b 100644
--- a/fpga/usrp3/tools/make/viv_preamble.mak
+++ b/fpga/usrp3/tools/make/viv_preamble.mak
@@ -6,8 +6,8 @@
 # Environment Setup
 # -------------------------------------------------------------------
 ifeq ($(VIV_PLATFORM),Cygwin)
-RESOLVE_PATH = $(subst \,/,$(shell cygpath -aw $(1)))
-RESOLVE_PATHS = "$(foreach path,$(1),$(subst \,/,$(shell cygpath -aw $(abspath $(path)))))"
+RESOLVE_PATH = $(if $(1),$(subst \,/,$(shell cygpath -aw $(1))))
+RESOLVE_PATHS = "$(if $(1),$(foreach path,$(1),$(subst \,/,$(shell cygpath -aw $(abspath $(path))))))"
 else
 RESOLVE_PATH = $(1)
 RESOLVE_PATHS = "$(1)"
@@ -18,8 +18,8 @@ endif
 # -------------------------------------------------------------------
 # Requirement: BASE_DIR must be defined
 
-TOOLS_DIR = $(abspath $(BASE_DIR)/../tools)
-LIB_DIR = $(abspath $(BASE_DIR)/../lib)
+TOOLS_DIR  = $(abspath $(BASE_DIR)/../tools)
+LIB_DIR    = $(abspath $(BASE_DIR)/../lib)
 SIMLIB_DIR = $(abspath $(BASE_DIR)/../sim)
 LIB_IP_DIR = $(abspath $(LIB_DIR)/ip)
 HLS_IP_DIR = $(abspath $(LIB_DIR)/hls)
-- 
cgit v1.2.3