diff options
| author | Andrew Moch <Andrew.Moch@ni.com> | 2020-07-29 16:07:10 +0100 |
|---|---|---|
| committer | Wade Fife <wade.fife@ettus.com> | 2020-07-30 15:00:06 -0500 |
| commit | ffdce1c3fc229579b9d30afe489d2749c0c956ed (patch) | |
| tree | 48469e3d0701172a4fc9b1d4b81c225f53c628ad /fpga/usrp3/tools/make | |
| parent | 3b39cb90df3e22897091735dc7bc0c3675eef518 (diff) | |
| download | uhd-ffdce1c3fc229579b9d30afe489d2749c0c956ed.tar.gz uhd-ffdce1c3fc229579b9d30afe489d2749c0c956ed.tar.bz2 uhd-ffdce1c3fc229579b9d30afe489d2749c0c956ed.zip | |
fpga: tools: RESOLVE_PATH checks for an empty path
Diffstat (limited to 'fpga/usrp3/tools/make')
| -rw-r--r-- | fpga/usrp3/tools/make/viv_preamble.mak | 8 |
1 files changed, 4 insertions, 4 deletions
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) |