move -whole-archive flags to central config

2021-06-10 15:20:19 +02:00
parent 209b979e56
commit 1c9887bd45
2 changed files with 4 additions and 3 deletions
@@ -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))
-
@@ -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