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

Revert "Fetch the custom cfg/CONFIG_* files early"

Browse Source 
This reverts commit e4fbd83c93.

It introduced a build problem when using INSTALL_LOCATION:
The system yacc and lex are used instead of the EPICS antelope and e_flex.
This commit is contained in:
zimoch
2025-10-28 10:40:50 +01:00
parent 15c68ff3d3
commit ec00f65236
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
configure/CONFIG
+1 -3
View File
@@ -50,9 +50,6 @@ endif
include $(CONFIG)/CONFIG_COMMON include $(CONFIG)/CONFIG_COMMON
include $(CONFIG)/CONFIG_FILE_TYPE include $(CONFIG)/CONFIG_FILE_TYPE
# Fetch the module-specific CFGS before overwriting INSTALL_LOCATION in order to load them later
TOP_CFG_CONFIGS := $(wildcard $(INSTALL_CFG)/CONFIG*)
# Base-specific build options # Base-specific build options
# #
include $(CONFIG)/CONFIG_BASE include $(CONFIG)/CONFIG_BASE
@@ -120,6 +117,7 @@ endif
# Include $(INSTALL_CFG)/CONFIG* definitions # Include $(INSTALL_CFG)/CONFIG* definitions
# #
TOP_CFG_CONFIGS = $(wildcard $(INSTALL_CFG)/CONFIG*)
ifneq ($(TOP_CFG_CONFIGS),) ifneq ($(TOP_CFG_CONFIGS),)
include $(TOP_CFG_CONFIGS) include $(TOP_CFG_CONFIGS)
endif endif