Make EXPAND rule work on all arch's

Fixes build for linux-arm in src/util.
Don't expand files unless specifically requested.
Expanded files are always precious.
This commit is contained in:
Andrew Johnson
2016-07-06 17:05:04 -05:00
parent 22ef569682
commit ddeb0a827c
2 changed files with 3 additions and 9 deletions

View File

@@ -1,7 +1,5 @@
# <top>/configure/RULES_EXPAND
ifeq ($(findstring Host,$(VALID_BUILDS)),Host)
# Default settings
EXPAND_TOOL ?= $(PERL) $(TOOLS)/expandVars.pl
@@ -10,8 +8,6 @@ EXPANDFLAGS += $(addprefix -D ,$(EXPAND_VARS))
EXPANDED = $(EXPAND:%@=%)
buildInstall: $(EXPANDED)
$(EXPANDED): %: ../%@
$(ECHO) "Expanding $< to $@"
@$(RM) $@
@@ -20,4 +16,4 @@ $(EXPANDED): %: ../%@
clean::
@$(RM) $(EXPANDED)
endif
.PRECIOUS: $(EXPANDED)

View File

@@ -1,10 +1,10 @@
#*************************************************************************
# Copyright (c) 2002 The University of Chicago, as Operator of Argonne
# Copyright (c) 2016 UChicago Argonne LLC, as Operator of Argonne
# National Laboratory.
# Copyright (c) 2002 The Regents of the University of California, as
# Operator of Los Alamos National Laboratory.
# EPICS BASE is distributed subject to a Software License Agreement found
# in file LICENSE that is included with this distribution.
# in file LICENSE that is included with this distribution.
#*************************************************************************
TOP=../..
@@ -33,5 +33,3 @@ EXPAND += caRepeater.service@
EXPAND_VARS = INSTALL_BIN=$(abspath $(INSTALL_BIN))
include $(TOP)/configure/RULES
.PRECIOUS: $(EXPANDED)