CHPL_TARGET_COMPILER_COMMAND_C -> CHPL_TARGET_CC etc

--- Signed-off-by: Michael Ferguson <mppf@users.noreply.github.com>
chapel-lang · Jun 16, 2021 · 03bd585 · 03bd585
1 parent 85ac4cb
commit 03bd585
Show file tree

Hide file tree

Showing 9 changed files with 44 additions and 47 deletions.
diff --git a/make/Makefile.base b/make/Makefile.base
@@ -115,16 +115,16 @@ CHPL_MAKE_AUXFS = $(CHPL_MAKE_AUX_FILESYS)
 # on CHPL_MAKE_HOST_TARGET to the HOST or TARGET versions.
 ifeq ($(strip $(CHPL_MAKE_HOST_TARGET)),--target)
 CHPL_MAKE_COMPILER = $(CHPL_MAKE_TARGET_COMPILER)
-CHPL_MAKE_COMPILER_COMMAND_C = $(CHPL_MAKE_TARGET_COMPILER_COMMAND_C)
-CHPL_MAKE_COMPILER_COMMAND_CXX = $(CHPL_MAKE_TARGET_COMPILER_COMMAND_CXX)
+CHPL_MAKE_CC = $(CHPL_MAKE_TARGET_CC)
+CHPL_MAKE_CXX = $(CHPL_MAKE_TARGET_CXX)
 CHPL_MAKE_PLATFORM = $(CHPL_MAKE_TARGET_PLATFORM)
 CHPL_MAKE_ARCH = $(CHPL_MAKE_TARGET_ARCH)
 CHPL_MAKE_MEM = $(CHPL_MAKE_TARGET_MEM)
 CHPL_MAKE_SANITIZE = $(CHPL_MAKE_SANITIZE_EXE)
 else
 CHPL_MAKE_COMPILER = $(CHPL_MAKE_HOST_COMPILER)
-CHPL_MAKE_COMPILER_COMMAND_C = $(CHPL_MAKE_HOST_COMPILER_COMMAND_C)
-CHPL_MAKE_COMPILER_COMMAND_CXX = $(CHPL_MAKE_HOST_COMPILER_COMMAND_CXX)
+CHPL_MAKE_CC = $(CHPL_MAKE_HOST_CC)
+CHPL_MAKE_CXX = $(CHPL_MAKE_HOST_CXX)
 CHPL_MAKE_PLATFORM = $(CHPL_MAKE_HOST_PLATFORM)
 CHPL_MAKE_ARCH = $(CHPL_MAKE_HOST_ARCH)
 CHPL_MAKE_MEM = $(CHPL_MAKE_HOST_MEM)
@@ -203,8 +203,8 @@ printplatform:
 	@echo "CHPL_MAKE_HOST_PLATFORM   = $(CHPL_MAKE_HOST_PLATFORM)"
 	@echo "CHPL_MAKE_TARGET_PLATFORM = $(CHPL_MAKE_TARGET_PLATFORM)"
 	@echo "CHPL_MAKE_COMPILER        = $(CHPL_MAKE_COMPILER)"
-	@echo "CHPL_MAKE_COMPILER_COMMAND_C = $(CHPL_MAKE_COMPILER_COMMAND_C)"
-	@echo "CHPL_MAKE_COMPILER_COMMAND_CXX = $(CHPL_MAKE_COMPILER_COMMAND_CXX)"
+	@echo "CHPL_MAKE_CC              = $(CHPL_MAKE_CC)"
+	@echo "CHPL_MAKE_CXX             = $(CHPL_MAKE_CXX)"
 	@echo "CHPL_MAKE_LOCALE_MODEL    = $(CHPL_MAKE_LOCALE_MODEL)"
 	@echo "CHPL_MAKE_TASKS           = $(CHPL_MAKE_TASKS)"
 	@echo "CHPL_MAKE_THREADS         = $(CHPL_MAKE_THREADS)"
@@ -296,13 +296,13 @@ EXE_SUFFIX =
 
 # in case something goes wrong and we don't have a compiler, try
 # falling back on gcc.
-ifeq ($(CHPL_MAKE_COMPILER_COMMAND_CXX),)
-  $(warning CHPL_MAKE_COMPILER_COMMAND_CXX is not set so setting it to g++)
-  CHPL_MAKE_COMPILER_COMMAND_CXX = g++
+ifeq ($(CHPL_MAKE_CXX),)
+  $(warning CHPL_MAKE_CXX is not set so setting it to g++)
+  CHPL_MAKE_CXX = g++
 endif
-ifeq ($(CHPL_MAKE_COMPILER_COMMAND_C),)
-  $(warning CHPL_MAKE_COMPILER_COMMAND_C is not set so setting it to gcc)
-  CHPL_MAKE_COMPILER_COMMAND_C = gcc
+ifeq ($(CHPL_MAKE_CC),)
+  $(warning CHPL_MAKE_CC is not set so setting it to gcc)
+  CHPL_MAKE_CC = gcc
 endif
 
 #

diff --git a/make/compiler/Makefile.clang b/make/compiler/Makefile.clang
@@ -24,17 +24,17 @@
 # Tools
 #
 
-CXX = $(CHPL_MAKE_COMPILER_COMMAND_CXX) # normally clang++
-CC = $(CHPL_MAKE_COMPILER_COMMAND_C)    # normally clang
+CXX = $(CHPL_MAKE_CXX) # normally clang++
+CC = $(CHPL_MAKE_CC)   # normally clang
 
 ifeq ($(CHPL_MAKE_COMPILER), llvm)
   ifeq ($(CHPL_MAKE_LLVM), bundled)
     # handle using the included clang compiler
     ifndef CLANG_SYSROOT_ARGS
       export CLANG_SYSROOT_ARGS=$(shell cat $(LLVM_CLANG_ARGUMENTS_FILE))
     endif
-    CXX = $(CHPL_MAKE_COMPILER_COMMAND_CXX) $(CLANG_SYSROOT_ARGS)
-    CC = $(CHPL_MAKE_COMPILER_COMMAND_C) $(CLANG_SYSROOT_ARGS)
+    CXX = $(CHPL_MAKE_CXX) $(CLANG_SYSROOT_ARGS)
+    CC = $(CHPL_MAKE_CC) $(CLANG_SYSROOT_ARGS)
   endif
 endif
 

diff --git a/make/compiler/Makefile.cray-prgenv b/make/compiler/Makefile.cray-prgenv
@@ -24,8 +24,8 @@
 # tools.
 #
 
-CC = $(CHPL_MAKE_COMPILER_COMMAND_C)     # normally cc
-CXX = $(CHPL_MAKE_COMPILER_COMMAND_CXX)  # normally CC
+CC = $(CHPL_MAKE_CC)     # normally cc
+CXX = $(CHPL_MAKE_CXX)   # normally CC
 
 RANLIB = ranlib
 

diff --git a/make/compiler/Makefile.gnu b/make/compiler/Makefile.gnu
@@ -23,8 +23,8 @@
 #
 # Tools
 #
-CXX = $(CHPL_MAKE_COMPILER_COMMAND_CXX) # normally g++
-CC = $(CHPL_MAKE_COMPILER_COMMAND_C)    # normally gcc
+CXX = $(CHPL_MAKE_CXX) # normally g++
+CC = $(CHPL_MAKE_C)    # normally gcc
 
 RANLIB = ranlib
 

diff --git a/make/compiler/Makefile.ibm b/make/compiler/Makefile.ibm
@@ -23,8 +23,8 @@
 #
 # Tools
 #
-CXX = $(CHPL_MAKE_COMPILER_COMMAND_CXX) # normally xlC
-CC = $(CHPL_MAKE_COMPILER_COMMAND_C)    # normally xlc
+CXX = $(CHPL_MAKE_CXX) # normally xlC
+CC = $(CHPL_MAKE_CC)   # normally xlc
 
 RANLIB = ranlib
 

diff --git a/make/compiler/Makefile.intel b/make/compiler/Makefile.intel
@@ -23,8 +23,8 @@
 #
 # Tools
 #
-CXX = $(CHPL_MAKE_COMPILER_COMMAND_CXX) # normally icpc
-CC = $(CHPL_MAKE_COMPILER_COMMAND_C)    # normally icc
+CXX = $(CHPL_MAKE_CXX) # normally icpc
+CC = $(CHPL_MAKE_CC)   # normally icc
 
 ifeq (, $(MPI_CC))
 MPI_CC = mpiicc

diff --git a/make/compiler/Makefile.pgi b/make/compiler/Makefile.pgi
@@ -23,8 +23,8 @@
 #
 # Tools
 #
-CXX = $(CHPL_MAKE_COMPILER_COMMAND_CXX) # normally pgc++
-CC = $(CHPL_MAKE_COMPILER_COMMAND_C)    # normally pgcc
+CXX = $(CHPL_MAKE_CXX) # normally pgc++
+CC = $(CHPL_MAKE_CC)   # normally pgcc
 
 RANLIB = ranlib
 

diff --git a/util/chplenv/chpl_compiler.py b/util/chplenv/chpl_compiler.py
@@ -250,37 +250,34 @@ def get_compiler_command(flag, lang):
 
     if lang_upper == 'C++':
         lang_upper = 'CXX'
+    elif lang_upper == 'C':
+        lang_upper = 'CC'
 
     if flag_upper == 'HOST' or flag_upper == 'TARGET':
         pass
     else:
         error('unknown flag {0}'.format(flag))
 
-    if lang_upper == 'C' or lang_upper == 'CXX':
+    if lang_upper == 'CC' or lang_upper == 'CXX':
         pass
     else:
         error('unknown lang {0}'.format(lang))
 
-    varname = 'CHPL_' + flag_upper + '_COMPILER_COMMAND_' + lang_upper
+    # construct CHPL_HOST_CC / CHPL_TARGET_CXX etc
+    varname = 'CHPL_' + flag_upper + '_' + lang_upper
 
     command = overrides.get(varname, '');
     if command:
         return command
 
-    # If CHPL_TARGET_COMPILER_COMMAND_C etc was not set, look at CC/CXX
-    if lang_upper == 'C':
-        cc_val = overrides.get('CC', '')
-        if cc_val:
-            return cc_val
-
-    if lang_upper == 'CXX':
-        cxx_val = overrides.get('CXX', '')
-        if cxx_val:
-            return cxx_val
+    # If CHPL_HOST_CC etc was not set, look at CC/CXX
+    cc_cxx_val = overrides.get(lang_upper, '')
+    if cc_cxx_val:
+        return cc_cxx_val
 
     compiler_val = get(flag=flag)
 
-    if lang_upper == 'C':
+    if lang_upper == 'CC':
         command = get_compiler_name_c(compiler_val)
     elif lang_upper == 'CXX':
         command = get_compiler_name_cxx(compiler_val)

diff --git a/util/chplenv/printchplenv.py b/util/chplenv/printchplenv.py
@@ -63,14 +63,14 @@
 CHPL_ENVS = [
     ChapelEnv('CHPL_HOST_PLATFORM', COMPILER | LAUNCHER),
     ChapelEnv('CHPL_HOST_COMPILER', COMPILER | LAUNCHER),
-    ChapelEnv('  CHPL_HOST_COMPILER_COMMAND_C', COMPILER | LAUNCHER),
-    ChapelEnv('  CHPL_HOST_COMPILER_COMMAND_CXX',COMPILER | LAUNCHER),
+    ChapelEnv('  CHPL_HOST_CC', COMPILER | LAUNCHER),
+    ChapelEnv('  CHPL_HOST_CXX',COMPILER | LAUNCHER),
     ChapelEnv('CHPL_HOST_ARCH', COMPILER | LAUNCHER),
     ChapelEnv('CHPL_HOST_CPU', INTERNAL),
     ChapelEnv('CHPL_TARGET_PLATFORM', RUNTIME | DEFAULT),
     ChapelEnv('CHPL_TARGET_COMPILER', RUNTIME | DEFAULT),
-    ChapelEnv('  CHPL_TARGET_COMPILER_COMMAND_C', RUNTIME),
-    ChapelEnv('  CHPL_TARGET_COMPILER_COMMAND_CXX', RUNTIME),
+    ChapelEnv('  CHPL_TARGET_CC', RUNTIME),
+    ChapelEnv('  CHPL_TARGET_CXX', RUNTIME),
     ChapelEnv('  CHPL_TARGET_COMPILER_PRGENV', INTERNAL),
     ChapelEnv('CHPL_TARGET_ARCH', RUNTIME | DEFAULT),
     ChapelEnv('CHPL_TARGET_CPU', RUNTIME | DEFAULT, 'arch'),
@@ -137,8 +137,8 @@ def compute_all_values():
     host_compiler_c = chpl_compiler.get_compiler_command('host', 'c')
     host_compiler_cpp = chpl_compiler.get_compiler_command('host', 'c++')
     ENV_VALS['CHPL_HOST_COMPILER'] = host_compiler
-    ENV_VALS['  CHPL_HOST_COMPILER_COMMAND_C'] = host_compiler_c
-    ENV_VALS['  CHPL_HOST_COMPILER_COMMAND_CXX'] = host_compiler_cpp
+    ENV_VALS['  CHPL_HOST_CC'] = host_compiler_c
+    ENV_VALS['  CHPL_HOST_CXX'] = host_compiler_cpp
 
     ENV_VALS['CHPL_HOST_ARCH'] = chpl_arch.get('host')
     ENV_VALS['CHPL_HOST_CPU'] = chpl_cpu.get('host').cpu
@@ -149,8 +149,8 @@ def compute_all_values():
     target_compiler_cpp = chpl_compiler.get_compiler_command('target', 'c++')
     target_compiler_prgenv = chpl_compiler.get_prgenv_compiler()
     ENV_VALS['CHPL_TARGET_COMPILER'] = target_compiler
-    ENV_VALS['  CHPL_TARGET_COMPILER_COMMAND_C'] = target_compiler_c
-    ENV_VALS['  CHPL_TARGET_COMPILER_COMMAND_CXX'] = target_compiler_cpp
+    ENV_VALS['  CHPL_TARGET_CC'] = target_compiler_c
+    ENV_VALS['  CHPL_TARGET_CXX'] = target_compiler_cpp
     ENV_VALS['  CHPL_TARGET_COMPILER_PRGENV'] = target_compiler_prgenv
 
     ENV_VALS['CHPL_TARGET_ARCH'] = chpl_arch.get('target')