epics/epics-base
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

Set EPICS_HOST_ARCH in the environment, not just locally

Browse Source 
This is essential for submodules, which now need that value to load
the right modules/RELEASE.<host>.local file which gives them their
path to EPICS_BASE (they can't set it for themselves without knowing
that path because the startup directory is part of core!).
This commit is contained in:
Andrew Johnson
2017-12-07 18:01:09 -06:00
parent c9ca39ce70
commit 28a8c06075
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
configure/CONFIG
+5 -4
View File
@@ -20,11 +20,12 @@ else
endif
# Provide a default if the user hasn't set EPICS_HOST_ARCH
ifeq ($(origin EPICS_HOST_ARCH), undefined)
# NB: We use a simply expanded variable here for performance:
EPICS_HOST_ARCH := $(shell $(CONFIG)/../startup/EpicsHostArch.pl)
ifeq ($(strip $(EPICS_HOST_ARCH)),)
# NB: We must set the environment variable for submodules to include
# the correct modules/RELEASE.<host>.local file to set EPICS_BASE,
# they can't do this for themselves since CONFIG is relative to it:
export EPICS_HOST_ARCH := $(shell $(CONFIG)/../startup/EpicsHostArch.pl)
endif
#
-include $(CONFIG)/RELEASE
-include $(CONFIG)/RELEASE.$(EPICS_HOST_ARCH)