|
14 | 14 | # limitations under the License. |
15 | 15 |
|
16 | 16 | import argparse |
17 | | -import datetime |
18 | 17 | import enum |
19 | 18 | import logging |
20 | 19 | import os |
@@ -406,24 +405,14 @@ def _fill_inferred(self): |
406 | 405 | self.llvm_repo_dir = join(self.repos_dir, 'llvm.git') |
407 | 406 | self.newlib_repo_dir = join(self.repos_dir, 'newlib.git') |
408 | 407 | self.cmake_generator = 'Ninja' if self.use_ninja else 'Unix Makefiles' |
409 | | - self.release_mode = self.revision != 'HEAD' |
410 | | - if self.release_mode: |
411 | | - version_suffix = '-' + self.revision |
412 | | - self.version_string = self.revision |
413 | | - else: |
414 | | - version_suffix = '' |
415 | | - now = datetime.datetime.now() |
416 | | - self.version_string = now.strftime('%Y-%m-%d-%H:%M:%S') |
| 408 | + self.version_string = self.revision |
417 | 409 | self.skip_reconfigure = self.build_mode == BuildMode.INCREMENTAL |
418 | | - product_name = 'LLVMEmbeddedToolchainForArm' |
419 | | - self.bin_package_base_name = product_name + version_suffix |
420 | | - self.src_package_base_name = product_name + version_suffix + '-src' |
421 | | - self.target_llvm_dir = join( |
422 | | - self.install_dir, |
423 | | - '{}-{}'.format(product_name, self.revision)) |
424 | | - self.install_src_subdir = join( |
425 | | - self.install_dir, |
426 | | - '{}-{}-src'.format(product_name, self.revision)) |
| 410 | + bin_name = 'LLVMEmbeddedToolchainForArm-{}'.format(self.revision) |
| 411 | + src_name = bin_name + '-src' |
| 412 | + self.bin_package_base_name = bin_name |
| 413 | + self.src_package_base_name = src_name |
| 414 | + self.target_llvm_dir = join(self.install_dir, bin_name) |
| 415 | + self.install_src_subdir = join(self.install_dir, src_name) |
427 | 416 | if self.is_cross_compiling: |
428 | 417 | self.native_llvm_build_dir = join(self.build_dir, 'native-llvm') |
429 | 418 | self.native_llvm_dir = join(self.install_dir, 'native-llvm') |
|
0 commit comments