From 08f93778d0d43dd7b8d0504ec77d918462bce171 Mon Sep 17 00:00:00 2001
From: Simon Rose <simon.rose@ess.eu>
Date: Tue, 16 Feb 2021 08:51:53 +0100
Subject: [PATCH] Switched to correct relative paths for vlibs
---
require-ess/tools/driver.makefile | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/require-ess/tools/driver.makefile b/require-ess/tools/driver.makefile
index dad65088..f235ae41 100644
--- a/require-ess/tools/driver.makefile
+++ b/require-ess/tools/driver.makefile
@@ -688,7 +688,7 @@ SNCALL=$(shell ls -dv $(E3_SITEMODS_PATH)/sequencer/$(call FETCH_BUILD_NUMBER,$
SNC=$(lastword $(SNCALL))/snc
ifneq (,$(strip $(VLIBS)))
-USR_LDFLAGS_$(T_A) += $(foreach l,$(VLIBS),-L$(dir $(l)))
+USR_LDFLAGS_$(T_A) += $(foreach l,$(VLIBS),-L../$(dir $(l)))
USR_LDFLAGS_$(T_A) += -Wl,-rpath,"\$$ORIGIN/vendor"
endif
@@ -752,7 +752,7 @@ EPICS_INCLUDES += -I$(EPICS_BASE_INCLUDE) -I$(EPICS_BASE_INCLUDE)/os/$(OS_CLASS)
# Find all sources and set vpath accordingly.
$(foreach file, ${SRCS} ${TEMPLS} ${DBDINSTALLS} ${SCR}, $(eval vpath $(notdir ${file}) ../$(dir ${file})))
-$(foreach file,${VLIBS},$(eval vpath $(notdir ${file}) $(dir ${file})))
+$(foreach file,${VLIBS},$(eval vpath $(notdir ${file}) ../$(dir ${file})))
# Do not treat %.dbd the same way because it creates a circular dependency
# if a source dbd has the same name as the project dbd. Have to clear %.dbd and not use ../ path.
--
GitLab