EPICS Base

Merge ~bhill/epics-base:MAKEFLAGS-to-MFLAGS into ~epics-core/epics-base/+git/epics-base:3.15

  1. Git
  2. lp:~bhill/epics-base
  3. MAKEFLAGS-to-MFLAGS
  4. Merge into 3.15
Proposed by Bruce Hill
Status: Merged
Merged at revision: 5f3f87a365e37982abfbe3d4133578a24023d041
Proposed branch: ~bhill/epics-base:MAKEFLAGS-to-MFLAGS
Merge into: ~epics-core/epics-base/+git/epics-base:3.15
Diff against target: 13 lines (+1/-1)
1 file modified
configure/CONFIG_COMMON (+1/-1)
Reviewer Review Type Date Requested Status
Andrew Johnson Approve
Review via email: mp+358144@code.launchpad.net

Description of the change

Make definition of ECHO macro more robust by using MFLAGS instead of MAKEFLAGS.

MFLAGS doesn't hold macro definitions from the command line arguments, so we don't
have to filter out T_A= to get "make T_A=vxWorks-ppc32" to work correctly.
Also allows defining other macros in make command line w/o worrying about whether
or not the macro includes an "s" character.

To post a comment you must log in.
Revision history for this message
Bruce Hill (bhill) wrote :

Original introduction of T_A= was d286a81e, Janet Anderson, 2011

Revision history for this message
Andrew Johnson (anj) wrote :

Like.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/configure/CONFIG_COMMON b/configure/CONFIG_COMMON
2index e6e6033..43f4866 100644
3--- a/configure/CONFIG_COMMON
4+++ b/configure/CONFIG_COMMON
5@@ -82,7 +82,7 @@ IOCS_APPL_TOP = $(shell $(FULLPATHNAME) $(INSTALL_LOCATION))
6 #-------------------------------------------------------
7 # Make echo output - suppress echoing if make's '-s' flag is set
8 NOP = :
9-ECHO = @$(if $(findstring s,$(patsubst T_A=%,,$(MAKEFLAGS))),$(NOP),echo)
10+ECHO = @$(if $(findstring s,$(MFLAGS)),$(NOP),echo)
11
12 #-------------------------------------------------------
13 ifdef T_A

Subscribers

People subscribed via source and target branches