From be252febd001feac093b36c987d276720e4244ab Mon Sep 17 00:00:00 2001 From: Humberto Jimenez Date: Mon, 11 May 2020 09:10:12 -0500 Subject: fpga: tools: Fix HLS IP build with Cygwin --- fpga/usrp3/tools/make/viv_hls_ip_builder.mak | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'fpga/usrp3/tools/make') diff --git a/fpga/usrp3/tools/make/viv_hls_ip_builder.mak b/fpga/usrp3/tools/make/viv_hls_ip_builder.mak index 67b52ed2a..77f09157f 100644 --- a/fpga/usrp3/tools/make/viv_hls_ip_builder.mak +++ b/fpga/usrp3/tools/make/viv_hls_ip_builder.mak @@ -9,6 +9,7 @@ # $3 = HLS_IP_SRCS (Absolute paths to the HLS IP source files) # $4 = HLS_IP_SRC_DIR (Absolute path to the top level HLS IP src dir) # $5 = HLS_IP_BUILD_DIR (Absolute path to the top level HLS IP build dir) +# $6 = HLS_IP_INCLUDES (Absolute path to IP include dir) # Prereqs: # - TOOLS_DIR must be defined globally # ------------------------------------------------------------------- @@ -19,15 +20,15 @@ BUILD_VIVADO_HLS_IP = \ echo "========================================================"; \ export HLS_IP_NAME=$(1); \ export PART_NAME=$(subst /,,$(2)); \ - export HLS_IP_SRCS='$(3)'; \ - export HLS_IP_INCLUDES='$(6)'; \ + export HLS_IP_SRCS=$(call RESOLVE_PATHS,$(3)); \ + export HLS_IP_INCLUDES=$(call RESOLVE_PATHS,$(6)); \ echo "BUILDER: Staging HLS IP in build directory..."; \ $(TOOLS_DIR)/scripts/shared-ip-loc-manage.sh --path=$(5)/$(1) reserve; \ cp -rf $(4)/$(1)/* $(5)/$(1); \ cd $(5); \ echo "BUILDER: Building HLS IP..."; \ export VIV_ERR=0; \ - vivado_hls -f $(TOOLS_DIR)/scripts/viv_generate_hls_ip.tcl -l $(1).log || export VIV_ERR=$$?; \ + vivado_hls -f $(call RESOLVE_PATH,$(TOOLS_DIR)/scripts/viv_generate_hls_ip.tcl) -l $(1).log || export VIV_ERR=$$?; \ $(TOOLS_DIR)/scripts/shared-ip-loc-manage.sh --path=$(5)/$(1) release; \ exit $$(($$VIV_ERR)) -- cgit v1.2.3