From 0e5dc2a21cc868912f9840a8213b33df99ec0d50 Mon Sep 17 00:00:00 2001
From: Andrew Johnson <anj@aps.anl.gov>
Date: Thu, 28 Apr 2016 18:56:03 -0500
Subject: [PATCH] More build parameters.

Renamed EPICS_TARGET_ARCH to EPICS_BUILD_TARGET_ARCH
Added EPICS_BUILD_OS_CLASS and EPICS_BUILD_COMPILER_CLASS
---
 src/ioc/misc/iocshRegisterCommon.c |  2 +-
 src/libCom/env/RULES               |  3 ++-
 src/libCom/env/bldEnvData.pl       | 11 ++++++++---
 src/libCom/env/envDefs.h           |  6 ++++--
 4 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/src/ioc/misc/iocshRegisterCommon.c b/src/ioc/misc/iocshRegisterCommon.c
index 9e0936e2b..4bcd6d816 100644
--- a/src/ioc/misc/iocshRegisterCommon.c
+++ b/src/ioc/misc/iocshRegisterCommon.c
@@ -25,7 +25,7 @@
 void iocshRegisterCommon(void)
 {
     iocshPpdbbase = &pdbbase;
-    const char *targetArch = envGetConfigParamPtr(&EPICS_TARGET_ARCH);
+    const char *targetArch = envGetConfigParamPtr(&EPICS_BUILD_TARGET_ARCH);
 
     if (targetArch) {
         epicsEnvSet("ARCH", targetArch);
diff --git a/src/libCom/env/RULES b/src/libCom/env/RULES
index db7fa7656..07f71a5a0 100644
--- a/src/libCom/env/RULES
+++ b/src/libCom/env/RULES
@@ -10,4 +10,5 @@
 envData.c: $(LIBCOM)/env/envDefs.h $(LIBCOM)/env/bldEnvData.pl \
 	$(CONFIG)/CONFIG_ENV $(CONFIG)/CONFIG_SITE_ENV \
 	$(wildcard $(CONFIG)/os/CONFIG_SITE_ENV.$(T_A))
-	$(PERL) $(LIBCOM)/env/bldEnvData.pl $(INSTALL_QUIETLY) -t $(T_A) $(CONFIG)
+	$(PERL) $(LIBCOM)/env/bldEnvData.pl $(INSTALL_QUIETLY) -t $(T_A) \
+		-c $(CMPLR_CLASS) -s $(OS_CLASS) $(CONFIG)
diff --git a/src/libCom/env/bldEnvData.pl b/src/libCom/env/bldEnvData.pl
index 177dcf976..daa679b42 100644
--- a/src/libCom/env/bldEnvData.pl
+++ b/src/libCom/env/bldEnvData.pl
@@ -26,13 +26,13 @@ use Text::Wrap;
 
 my $tool = basename($0);
 
-our ($opt_h, $opt_q, $opt_t);
+our ($opt_h, $opt_q, $opt_t, $opt_s, $opt_c);
 our $opt_o = 'envData.c';
 
 $Getopt::Std::OUTPUT_HELP_VERSION = 1;
 $Text::Wrap::columns = 75;
 
-&HELP_MESSAGE unless getopts('ho:qt:') && @ARGV == 1;
+&HELP_MESSAGE unless getopts('ho:qt:s:c:') && @ARGV == 1;
 &HELP_MESSAGE if $opt_h;
 
 my $config   = AbsPath(shift);
@@ -68,9 +68,12 @@ if ($opt_t) {
         readReleaseFiles($config_arch_env, \%values);
     }
 
-    $values{EPICS_TARGET_ARCH} = $opt_t;
+    $values{EPICS_BUILD_TARGET_ARCH} = $opt_t;
 }
 
+$values{EPICS_BUILD_COMPILER_CLASS} = $opt_c if $opt_c;
+$values{EPICS_BUILD_OS_CLASS} = $opt_s if $opt_s;
+
 # Warn about any vars with no value
 #
 my @undefs = grep {!exists $values{$_}} @vars;
@@ -123,6 +126,8 @@ sub HELP_MESSAGE {
         "  -q       Quiet: Only print errors\n",
         "  -o file  Output filename, default is $opt_o\n",
         "  -t arch  Target architecture \$(T_A) name\n",
+        "  -s os    Operating system \$(OS_CLASS)\n",
+        "  -c comp  Compiler class \$(CMPLR_CLASS)\n",
         "\n";
 
     exit 1;
diff --git a/src/libCom/env/envDefs.h b/src/libCom/env/envDefs.h
index cb140c1fe..437e688e3 100644
--- a/src/libCom/env/envDefs.h
+++ b/src/libCom/env/envDefs.h
@@ -40,7 +40,7 @@ typedef struct envParam {
 } ENV_PARAM;
 
 /*
- * bldEnvData looks for "epicsShareExtern const ENV_PARAM"
+ * bldEnvData.pl looks for "epicsShareExtern const ENV_PARAM <name>;"
  */
 epicsShareExtern const ENV_PARAM EPICS_CA_ADDR_LIST;
 epicsShareExtern const ENV_PARAM EPICS_CA_CONN_TMO;
@@ -58,7 +58,9 @@ epicsShareExtern const ENV_PARAM EPICS_CAS_SERVER_PORT;
 epicsShareExtern const ENV_PARAM EPICS_CA_BEACON_PERIOD; /* deprecated */
 epicsShareExtern const ENV_PARAM EPICS_CAS_BEACON_PERIOD;
 epicsShareExtern const ENV_PARAM EPICS_CAS_BEACON_PORT;
-epicsShareExtern const ENV_PARAM EPICS_TARGET_ARCH;
+epicsShareExtern const ENV_PARAM EPICS_BUILD_COMPILER_CLASS;
+epicsShareExtern const ENV_PARAM EPICS_BUILD_OS_CLASS;
+epicsShareExtern const ENV_PARAM EPICS_BUILD_TARGET_ARCH;
 epicsShareExtern const ENV_PARAM EPICS_TIMEZONE;
 epicsShareExtern const ENV_PARAM EPICS_TS_NTP_INET;
 epicsShareExtern const ENV_PARAM EPICS_IOC_LOG_PORT;