Update the name of the environment variable in the files changed for …

…this PR

Since the old value of "shared" is not mentioned in those changes, the new value
of "pic" is not mentioned here.  Also does not change whether the environment
variable is printed out (yet), doing that in a separate commit.

Behavior is as expected

make/Makefile.base

@@ -65,7 +65,7 @@ endif
 # CHPL_MAKE_LLVM="llvm"
 # CHPL_MAKE_AUX_FILESYS="none"
 # CHPL_MAKE_COMPILER_SUBDIR=linux64/gnu/loc-flat/wide-struct/llvm-none
-# CHPL_MAKE_RUNTIME_SUBDIR=linux64/gnu/loc-flat/udp/everything/tasks-fifo/pthreads/tmr-generic/mem-default/atomics-intrinsics/none/gmp-none/hwloc-none/re-none/wide-struct/fs-none/libmode-none/
+# CHPL_MAKE_RUNTIME_SUBDIR=linux64/gnu/loc-flat/udp/everything/tasks-fifo/pthreads/tmr-generic/mem-default/atomics-intrinsics/none/gmp-none/hwloc-none/re-none/wide-struct/fs-none/lib_pic-none/
 # CHPL_MAKE_LAUNCHER_SUBDIR=linux64/gnu/loc-flat/udp/everything/tasks-fifo/pthreads/launch-amudprun/tmr-generic/mem-default/atomics-intrinsics/none/wide-struct
 # CHPL_MAKE_JEMALLOC_UNIQ_CFG_PATH etc
 # CHPL_MAKE_THIRD_PARTY_LINK_ARGS

third-party/gasnet/Makefile.include

@@ -1,6 +1,6 @@
 GASNET_DIR = $(THIRD_PARTY_DIR)/gasnet
 GASNET_SUBDIR = $(GASNET_DIR)/gasnet-src
-GASNET_UNIQUE_SUBDIR = $(CHPL_MAKE_TARGET_PLATFORM)-$(CHPL_MAKE_TARGET_COMPILER)-$(CHPL_MAKE_RUNTIME_ARCH)-$(CHPL_MAKE_LIBMODE)/substrate-$(CHPL_MAKE_COMM_SUBSTRATE)/seg-$(CHPL_MAKE_COMM_SEGMENT)/$(CHPL_GASNET_DEBUG)
+GASNET_UNIQUE_SUBDIR = $(CHPL_MAKE_TARGET_PLATFORM)-$(CHPL_MAKE_TARGET_COMPILER)-$(CHPL_MAKE_RUNTIME_ARCH)-$(CHPL_MAKE_LIB_PIC)/substrate-$(CHPL_MAKE_COMM_SUBSTRATE)/seg-$(CHPL_MAKE_COMM_SEGMENT)/$(CHPL_GASNET_DEBUG)
 GASNET_BUILD_SUBDIR = build/$(GASNET_UNIQUE_SUBDIR)
 GASNET_BUILD_DIR = $(GASNET_DIR)/$(GASNET_BUILD_SUBDIR)
 GASNET_INSTALL_SUBDIR = install/$(GASNET_UNIQUE_SUBDIR)

util/chplenv/__init__.py

@@ -20,7 +20,7 @@
     'chpl_timers',
     'chpl_unwind',
     'chpl_wide_pointers',
-    'chpl_libmode',
+    'chpl_lib_pic',
     # third-party package configuration helpers
     'chpl_3p_gmp_configs',
     'chpl_3p_hwloc_configs',

util/chplenv/chpl_libmode.py → util/chplenv/chpl_lib_pic.py

@@ -10,15 +10,15 @@
 
 @memoize
 def get():
-    libmode_val = overrides.get('CHPL_LIBMODE')
-    if not libmode_val:
-        libmode_val = 'none'
-    return libmode_val
+    lib_pic_val = overrides.get('CHPL_LIB_PIC')
+    if not lib_pic_val:
+        lib_pic_val = 'none'
+    return lib_pic_val
 
 
 def _main():
-    libmode_val = get()
-    sys.stdout.write("{0}\n".format(libmode_val))
+    lib_pic_val = get()
+    sys.stdout.write("{0}\n".format(lib_pic_val))
 
 
 if __name__ == '__main__':

util/chplenv/overrides.py

@@ -38,7 +38,7 @@
              'CHPL_WIDE_POINTERS',
              'CHPL_LLVM',
              'CHPL_AUX_FILESYS',
-             'CHPL_LIBMODE',
+             'CHPL_LIB_PIC',
            ]
 
 

util/chplenv/third_party_utils.py

@@ -5,7 +5,7 @@
 chplenv_dir = os.path.dirname(__file__)
 sys.path.insert(0, os.path.abspath(chplenv_dir))
 
-import chpl_arch, chpl_compiler, chpl_libmode, chpl_locale_model, chpl_platform
+import chpl_arch, chpl_compiler, chpl_lib_pic, chpl_locale_model, chpl_platform
 from chpl_home_utils import get_chpl_home, get_chpl_third_party, using_chapel_module
 from utils import error, memoize, run_command
 
@@ -20,7 +20,7 @@ def default_uniq_cfg_path():
     return '{0}-{1}-{2}-{3}'.format(chpl_platform.get('target'),
                                     chpl_compiler.get('target'),
                                     arch_val,
-                                    chpl_libmode.get())
+                                    chpl_lib_pic.get())
 
 #
 # Returns the path to the packages install directory

util/printchplenv

@@ -93,7 +93,7 @@ CHPL_ENVS = [
     ChapelEnv('CHPL_REGEXP', RUNTIME | DEFAULT),
     ChapelEnv('CHPL_LLVM', COMPILER, 'llvm'),
     ChapelEnv('CHPL_AUX_FILESYS', RUNTIME | DEFAULT, 'fs'),
-    ChapelEnv('CHPL_LIBMODE', RUNTIME | DEFAULT, 'libmode'),
+    ChapelEnv('CHPL_LIB_PIC', RUNTIME | DEFAULT, 'lib_pic'),
     ChapelEnv('CHPL_RUNTIME_SUBDIR', INTERNAL),
     ChapelEnv('CHPL_LAUNCHER_SUBDIR', INTERNAL),
     ChapelEnv('CHPL_COMPILER_SUBDIR', INTERNAL),
@@ -159,7 +159,7 @@ def compute_all_values():
     ENV_VALS['CHPL_LLVM'] = chpl_llvm.get()
     aux_filesys = chpl_aux_filesys.get()
     ENV_VALS['CHPL_AUX_FILESYS'] = '_'.join(sorted(aux_filesys.split(' ')))
-    ENV_VALS['CHPL_LIBMODE'] = chpl_libmode.get()
+    ENV_VALS['CHPL_LIB_PIC'] = chpl_lib_pic.get()
 
 
 """Compute '--internal' env var values and populate global dict, ENV_VALS"""