maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[BOLT][NFC] Use LLVM_REVISION instead of BOLT_VERSION_STRING 

Remove duplicate version string identification

Reviewed By: rafauler

Differential Revision: https://reviews.llvm.org/D123549
This commit is contained in:
Amir Ayupov 2022-04-14 19:09:44 -07:00
parent 3d79c52f31
commit 2a9386726b
3 changed files with 2 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
bolt/CMakeLists.txt
View File

@ -59,31 +59,8 @@ if (BOLT_ENABLE_RUNTIME)
COMPONENT bolt)
endif()
# Get the current git revision for BOLT.
find_program(git_executable NAMES git git.exe git.cmd)
if (git_executable)
execute_process(COMMAND ${git_executable} rev-parse HEAD
WORKING_DIRECTORY ${LLVM_MAIN_SRC_DIR}
TIMEOUT 5
RESULT_VARIABLE git_result
OUTPUT_VARIABLE git_output)
if( git_result EQUAL 0 )
string(STRIP "${git_output}" git_ref_id)
set(BOLT_REVISION "${git_ref_id}")
endif()
endif()
find_program(GNU_LD_EXECUTABLE NAMES ${LLVM_DEFAULT_TARGET_TRIPLE}-ld.bfd ld.bfd DOC "GNU ld")
# If we can't find a revision, set it to "<unknown>".
if (NOT BOLT_REVISION)
set(BOLT_REVISION "<unknown>")
endif()
configure_file(
${CMAKE_CURRENT_SOURCE_DIR}/include/bolt/Utils/BoltRevision.inc.in
${CMAKE_CURRENT_BINARY_DIR}/include/bolt/Utils/BoltRevision.inc)
include_directories(
${CMAKE_CURRENT_SOURCE_DIR}/include
${CMAKE_CURRENT_BINARY_DIR}/include

1
bolt/include/bolt/Utils/BoltRevision.inc.in
View File

@ -1 +0,0 @@
#define BOLT_VERSION_STRING "@BOLT_REVISION@"

4
bolt/lib/Utils/CommandLineOpts.cpp
View File

@ -11,13 +11,13 @@
//===----------------------------------------------------------------------===//
#include "bolt/Utils/CommandLineOpts.h"
#include "bolt/Utils/BoltRevision.inc"
#include "llvm/Support/VCSRevision.h"
using namespace llvm;
namespace llvm {
namespace bolt {
const char *BoltRevision = BOLT_VERSION_STRING;
const char *BoltRevision = LLVM_REVISION;
}
}