Removed references to startup/EpicsHostArch

configure/E3/CONFIG_EXPORT

 # Variables should be transferred to module_name.makefile
 
-EPICS_HOST_ARCH:=$(shell $(EPICS_BASE)/startup/EpicsHostArch.pl 2> /dev/null)
-
-# In near future, BASE may drop "startup" directory, so
-# Note that the following line is not the same as e3-base, CONFIG_EXPORT
-ifeq ($(strip $(EPICS_HOST_ARCH)),)
 EPICS_HOST_ARCH:=$(shell perl $(EPICS_BASE)/lib/perl/EpicsHostArch.pl 2> /dev/null)
-endif
 
 MSI:=$(EPICS_BASE)/bin/$(EPICS_HOST_ARCH)/msi
 

configure/modules/CONFIG_EXPORT

 # Variables should be transferred to module_name.makefile
 
-EPICS_HOST_ARCH:=$(shell $(EPICS_BASE)/startup/EpicsHostArch.pl 2> /dev/null)
-
-# In near future, BASE may drop "startup" directory, so
-# Note that the following line is not the same as e3-base, CONFIG_EXPORT
-ifeq ($(strip $(EPICS_HOST_ARCH)),)
 EPICS_HOST_ARCH:=$(shell perl $(EPICS_BASE)/lib/perl/EpicsHostArch.pl 2> /dev/null)
-endif
 
 MSI:=$(EPICS_BASE)/bin/$(EPICS_HOST_ARCH)/msi
 

require-ess/tools/setE3Env.bash

@@ -214,12 +214,7 @@ else
 
 fi
 
-epics_host_arch_file="${EPICS_BASE}/startup/EpicsHostArch.pl"
-if [ -e "$epics_host_arch_file" ]; then
-  EPICS_HOST_ARCH=$("${EPICS_BASE}/startup/EpicsHostArch.pl")
-else
-  EPICS_HOST_ARCH=$(perl "${EPICS_BASE}"/lib/perl/EpicsHostArch.pl)
-fi
+EPICS_HOST_ARCH=$(perl "${EPICS_BASE}"/lib/perl/EpicsHostArch.pl)
 
 E3_REQUIRE_BIN=${E3_REQUIRE_LOCATION}/bin
 E3_REQUIRE_LIB=${E3_REQUIRE_LOCATION}/lib