From 1c9887bd4567bd029146c4f5167936d76ec8635a Mon Sep 17 00:00:00 2001 From: Dirk Zimoch Date: Thu, 10 Jun 2021 15:20:19 +0200 Subject: [PATCH] move -whole-archive flags to central config --- configure/os/CONFIG_SITE.Common.vxWorksCommon | 5 ++++- modules/database/src/std/softIoc/Makefile | 2 -- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/configure/os/CONFIG_SITE.Common.vxWorksCommon b/configure/os/CONFIG_SITE.Common.vxWorksCommon index ae9f403c0..e512fa290 100644 --- a/configure/os/CONFIG_SITE.Common.vxWorksCommon +++ b/configure/os/CONFIG_SITE.Common.vxWorksCommon @@ -59,6 +59,10 @@ OP_SYS_INCLUDE_CPPFLAGS_6 += -include $(VX_DIR)/target/h/vxWorks.h OP_SYS_INCLUDE_CPPFLAGS_7 += -include vxWorks.h OP_SYS_INCLUDE_CPPFLAGS = $(OP_SYS_INCLUDE_CPPFLAGS_$(VXWORKS_MAJOR_VERSION)) +OP_SYS_LDFLAGS += $(OP_SYS_LDFLAGS_$@) +OP_SYS_LDFLAGS_softIoc = -whole-archive +OP_SYS_LDFLAGS_softIocPVA = -whole-archive + # WIND_BASE is where you installed the Wind River software. WIND_BASE = /afs/psi.ch/project/vxworks/VxWorks$(VXWORKS_VERSION) @@ -70,4 +74,3 @@ SKIP_BUILDS_5 = $(PV_MODULES) SKIP_BUILDS_OLD = $(PV_MODULES) SKIP_BUILDS_6 = $(SKIP_BUILDS_$(VX_OLD_GCC)) SKIP_BUILDS = $(SKIP_BUILDS_$(VXWORKS_MAJOR_VERSION)) - diff --git a/modules/database/src/std/softIoc/Makefile b/modules/database/src/std/softIoc/Makefile index 10feee089..a432d358d 100644 --- a/modules/database/src/std/softIoc/Makefile +++ b/modules/database/src/std/softIoc/Makefile @@ -12,8 +12,6 @@ SRC_DIRS += $(STDDIR)/softIoc PROD_IOC_DEFAULT = softIoc PROD_IOC_iOS = -nil- -PROD_LDFLAGS_vxWorks = --whole-archive - DBD += base.dbd DBD += asSub.dbd DBD += softIoc.dbd