diff --git a/ci/vcpkg/overlay/llvm/portfile.cmake b/ci/vcpkg/overlay/llvm/portfile.cmake
index b6d5bdacd02..71f8f6d710f 100644
--- a/ci/vcpkg/overlay/llvm/portfile.cmake
+++ b/ci/vcpkg/overlay/llvm/portfile.cmake
@@ -2,6 +2,8 @@
 set(VCPKG_POLICY_ALLOW_EMPTY_FOLDERS enabled)
 
 vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+# Only build release configuration to speed up build time
+set(VCPKG_BUILD_TYPE release)
 
 # [BOLT] Allow to compile with MSVC (#151189)
 vcpkg_download_distfile(
diff --git a/cpp/src/gandiva/CMakeLists.txt b/cpp/src/gandiva/CMakeLists.txt
index 44ebfb2c413..a7f5f9dacff 100644
--- a/cpp/src/gandiva/CMakeLists.txt
+++ b/cpp/src/gandiva/CMakeLists.txt
@@ -276,7 +276,6 @@ add_gandiva_test(internals-test
                  hash_utils_test.cc
                  gdv_function_stubs_test.cc
                  interval_holder_test.cc
-                 target_datalayout_test.cc
                  tests/test_util.cc
                  EXTRA_LINK_LIBS
                  re2::re2
diff --git a/cpp/src/gandiva/engine.cc b/cpp/src/gandiva/engine.cc
index 5806413919d..c91afd7c4b7 100644
--- a/cpp/src/gandiva/engine.cc
+++ b/cpp/src/gandiva/engine.cc
@@ -305,7 +305,6 @@ Engine::Engine(const std::shared_ptr<Configuration>& conf,
   // LLVM 10 doesn't like the expr function name to be the same as the module name
   auto module_id = "gdv_module_" + std::to_string(reinterpret_cast<uintptr_t>(this));
   module_ = std::make_unique<llvm::Module>(module_id, *context_);
-  module_->setDataLayout(target_machine_->createDataLayout());
 }
 
 Engine::~Engine() {}
diff --git a/cpp/src/gandiva/target_datalayout_test.cc b/cpp/src/gandiva/target_datalayout_test.cc
deleted file mode 100644
index f5c1c8b9262..00000000000
--- a/cpp/src/gandiva/target_datalayout_test.cc
+++ /dev/null
@@ -1,64 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
-
-#include <gtest/gtest.h>
-#include <llvm/IR/DataLayout.h>
-#include <llvm/TargetParser/Host.h>
-
-#include "gandiva/llvm_generator.h"
-#include "gandiva/tests/test_util.h"
-
-namespace gandiva {
-
-class TestTargetDataLayout : public ::testing::Test {
- protected:
-  void SetUp() override {}
-};
-
-// Test that verifies the target data layout string representation
-// is consistent with the CPU architecture. This test is portable
-// across different architectures.
-TEST_F(TestTargetDataLayout, VerifyDataLayoutForArchitecture) {
-  // Create an LLVM generator with default configuration
-  ASSERT_OK_AND_ASSIGN(auto generator, LLVMGenerator::Make(TestConfiguration(), false));
-
-  // Get the module from the generator
-  llvm::Module* module = generator->module();
-  ASSERT_NE(module, nullptr);
-
-  // Get the data layout from the module
-  const llvm::DataLayout& data_layout = module->getDataLayout();
-  std::string data_layout_str = data_layout.getStringRepresentation();
-
-  // Verify that the data layout string is not empty
-  EXPECT_FALSE(data_layout_str.empty());
-
-  // Get the host CPU architecture information
-  std::string host_cpu = llvm::sys::getHostCPUName().str();
-  std::string triple = llvm::sys::getDefaultTargetTriple();
-
-  // Log the information for debugging
-  std::cout << "Host CPU: " << host_cpu << std::endl;
-  std::cout << "Target Triple: " << triple << std::endl;
-  std::cout << "Data Layout: " << data_layout_str << std::endl;
-
-  // Verify that the data layout string is not empty
-  EXPECT_FALSE(data_layout_str.empty());
-
-  }
-}  // namespace gandiva
-