cmake/lit: Use CMAKE_STRIP variable to provide strip tool name to hash.py

[atanasyan]

Summary

Host strip tool cannot recognize binary format of files built for another target architecture. The patch allows to override default strip tool name using CMAKE_STRIP configuration variable.

[jmolloy]

Hi Simon,

LGTM with one change.

Cheers,

James

CMakeLists.txt

82 ↗

(On Diff #51141)

CMake discovers "strip" by itself. This variable should never be unset, so you shouldn't need this code here.

(My CMakeCache.txt without this patch applied defines CMAKE_STRIP:FILEPATH=/usr/bin/strip)

[atanasyan]

In D18308#379003, @jmolloy wrote:

LGTM with one change.

Thanks for review.

test-suite/trunk/lit.site.cfg.in

 import sys
 
 config.test_source_root = "@CMAKE_BINARY_DIR@"
 config.test_suite_root = "@CMAKE_SOURCE_DIR@"
 config.remote_client = "@TEST_SUITE_REMOTE_CLIENT@"
 config.remote_host = "@TEST_SUITE_REMOTE_HOST@"
 config.remote_user = "@TEST_SUITE_REMOTE_USER@"
 config.remote_port = "@TEST_SUITE_REMOTE_PORT@"
 config.run_under = "@TEST_SUITE_RUN_UNDER@"
+config.strip_tool = "@CMAKE_STRIP@"
 config.profile_generate = @TEST_SUITE_PROFILE_GENERATE@
 config.llvm_profdata = "@TEST_SUITE_LLVM_PROFDATA@"
 
 lit_config.load_config(config, "@CMAKE_SOURCE_DIR@/lit.cfg")

test-suite/trunk/litsupport/hash.py

 
 def compute(context):
     executable = context.executable
     try:
         # Darwin's "strip" doesn't support these arguments.
         if platform.system() != 'Darwin':
             stripped_executable = executable + '.stripped'
             shutil.copyfile(executable, stripped_executable)
-            subprocess.check_call(['strip',
+            subprocess.check_call([context.config.strip_tool,
                                    '--remove-section=.comment',
                                    "--remove-section='.note*'",
                                    stripped_executable])
             executable = stripped_executable
 
         h = hashlib.md5()
         h.update(open(executable, 'rb').read())
         context.executable_hash = h.hexdigest()