Merge pull request #799 from amd/dev

Merge from AMD

Author: arjunsuresh

script/get-aocc/customize.py

@@ -73,7 +73,7 @@ def preprocess(i):
 def detect_version(i):
     logger = i['automation'].logger
 
-    r = i['automation'].parse_version({'match_text': r'CLANG:\s(?:AOCC_)?([\d.]+(?:pre)?(?:-[\w#]+)*(?:-Build#\d+)?|Unknown-Revision)(?=[ )])',
+    r = i['automation'].parse_version({'match_text': r'CLANG:\s(?:AOCC_)?([\d.]+(?:pre)?(?:[-_\w#]+)*(?:-Build#\d+)?|Unknown-Revision)(?=[ )])',
                                        'group_number': 1,
                                        'env_key': 'MLC_AOCC_VERSION',
                                        'which_env': i['env']})

script/get-llvm/customize.py

@@ -83,6 +83,12 @@ def postprocess(i):
 
     found_path = os.path.dirname(found_file_path)
 
+    env['MLC_LLVM_CLANG_BIN_PATH'] = found_path
+    env['MLC_LLVM_INSTALLED_PATH'] = os.path.dirname(
+        found_path)  # /usr in case of /usr/bin/clang
+
+    env['MLC_LLVM_CLANG_INSTALLED_PATH'] = env['MLC_LLVM_INSTALLED_PATH']
+
     file_name_c = os.path.basename(found_file_path)
     file_name_cpp = file_name_c.replace("clang", "clang++")