diff --git a/cmake/script/GenerateBuildInfo.cmake b/cmake/script/GenerateBuildInfo.cmake
index 694961df0b5..62773a3a543 100644
--- a/cmake/script/GenerateBuildInfo.cmake
+++ b/cmake/script/GenerateBuildInfo.cmake
@@ -28,71 +28,69 @@ else()
   set(WORKING_DIR ${CMAKE_CURRENT_SOURCE_DIR})
 endif()
 
-set(GIT_TAG)
-set(GIT_COMMIT)
-if(NOT "$ENV{BITCOIN_GENBUILD_NO_GIT}" STREQUAL "1")
-  if(GIT_EXECUTABLE)
+set(GIT_TAG "")
+set(GIT_COMMIT "")
+if(GIT_EXECUTABLE)
+  execute_process(
+    COMMAND ${GIT_EXECUTABLE} rev-parse --is-inside-work-tree
+    WORKING_DIRECTORY ${WORKING_DIR}
+    OUTPUT_VARIABLE IS_INSIDE_WORK_TREE
+    OUTPUT_STRIP_TRAILING_WHITESPACE
+    ERROR_QUIET
+  )
+  if(IS_INSIDE_WORK_TREE)
+    # Clean 'dirty' status of touched files that haven't been modified.
     execute_process(
-      COMMAND ${GIT_EXECUTABLE} rev-parse --is-inside-work-tree
+      COMMAND ${GIT_EXECUTABLE} diff
       WORKING_DIRECTORY ${WORKING_DIR}
-      OUTPUT_VARIABLE IS_INSIDE_WORK_TREE
+      OUTPUT_QUIET
+      ERROR_QUIET
+    )
+
+    execute_process(
+      COMMAND ${GIT_EXECUTABLE} describe --abbrev=0
+      WORKING_DIRECTORY ${WORKING_DIR}
+      OUTPUT_VARIABLE MOST_RECENT_TAG
       OUTPUT_STRIP_TRAILING_WHITESPACE
       ERROR_QUIET
     )
-    if(IS_INSIDE_WORK_TREE)
-      # Clean 'dirty' status of touched files that haven't been modified.
-      execute_process(
-        COMMAND ${GIT_EXECUTABLE} diff
-        WORKING_DIRECTORY ${WORKING_DIR}
-        OUTPUT_QUIET
-        ERROR_QUIET
-      )
 
+    execute_process(
+      COMMAND ${GIT_EXECUTABLE} rev-list -1 ${MOST_RECENT_TAG}
+      WORKING_DIRECTORY ${WORKING_DIR}
+      OUTPUT_VARIABLE MOST_RECENT_TAG_COMMIT
+      OUTPUT_STRIP_TRAILING_WHITESPACE
+      ERROR_QUIET
+    )
+
+    execute_process(
+      COMMAND ${GIT_EXECUTABLE} rev-parse HEAD
+      WORKING_DIRECTORY ${WORKING_DIR}
+      OUTPUT_VARIABLE HEAD_COMMIT
+      OUTPUT_STRIP_TRAILING_WHITESPACE
+      ERROR_QUIET
+    )
+
+    execute_process(
+      COMMAND ${GIT_EXECUTABLE} diff-index --quiet HEAD --
+      WORKING_DIRECTORY ${WORKING_DIR}
+      RESULT_VARIABLE IS_DIRTY
+    )
+
+    if(HEAD_COMMIT STREQUAL MOST_RECENT_TAG_COMMIT AND NOT IS_DIRTY)
+      # If latest commit is tagged and not dirty, then use the tag name.
+      set(GIT_TAG ${MOST_RECENT_TAG})
+    else()
+      # Otherwise, generate suffix from git, i.e. string like "0e0a5173fae3-dirty".
       execute_process(
-        COMMAND ${GIT_EXECUTABLE} describe --abbrev=0
+        COMMAND ${GIT_EXECUTABLE} rev-parse --short=12 HEAD
         WORKING_DIRECTORY ${WORKING_DIR}
-        OUTPUT_VARIABLE MOST_RECENT_TAG
+        OUTPUT_VARIABLE GIT_COMMIT
         OUTPUT_STRIP_TRAILING_WHITESPACE
         ERROR_QUIET
       )
-
-      execute_process(
-        COMMAND ${GIT_EXECUTABLE} rev-list -1 ${MOST_RECENT_TAG}
-        WORKING_DIRECTORY ${WORKING_DIR}
-        OUTPUT_VARIABLE MOST_RECENT_TAG_COMMIT
-        OUTPUT_STRIP_TRAILING_WHITESPACE
-        ERROR_QUIET
-      )
-
-      execute_process(
-        COMMAND ${GIT_EXECUTABLE} rev-parse HEAD
-        WORKING_DIRECTORY ${WORKING_DIR}
-        OUTPUT_VARIABLE HEAD_COMMIT
-        OUTPUT_STRIP_TRAILING_WHITESPACE
-        ERROR_QUIET
-      )
-
-      execute_process(
-        COMMAND ${GIT_EXECUTABLE} diff-index --quiet HEAD --
-        WORKING_DIRECTORY ${WORKING_DIR}
-        RESULT_VARIABLE IS_DIRTY
-      )
-
-      if(HEAD_COMMIT STREQUAL MOST_RECENT_TAG_COMMIT AND NOT IS_DIRTY)
-        # If latest commit is tagged and not dirty, then use the tag name.
-        set(GIT_TAG ${MOST_RECENT_TAG})
-      else()
-        # Otherwise, generate suffix from git, i.e. string like "0e0a5173fae3-dirty".
-        execute_process(
-          COMMAND ${GIT_EXECUTABLE} rev-parse --short=12 HEAD
-          WORKING_DIRECTORY ${WORKING_DIR}
-          OUTPUT_VARIABLE GIT_COMMIT
-          OUTPUT_STRIP_TRAILING_WHITESPACE
-          ERROR_QUIET
-        )
-        if(IS_DIRTY)
-          string(APPEND GIT_COMMIT "-dirty")
-        endif()
+      if(IS_DIRTY)
+        string(APPEND GIT_COMMIT "-dirty")
       endif()
     endif()
   endif()