diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt
index 962bdc5191ede..a804ee11f46b2 100644
--- a/cpp/CMakeLists.txt
+++ b/cpp/CMakeLists.txt
@@ -273,10 +273,7 @@ set(COMMON_LINT_OPTIONS
     --source_dir
     ${CMAKE_CURRENT_SOURCE_DIR}/examples
     --source_dir
-    ${CMAKE_CURRENT_SOURCE_DIR}/tools
-    # TODO: Move to java/CMakeLists.txt or somewhere
-    --source_dir
-    ${CMAKE_CURRENT_SOURCE_DIR}/../java)
+    ${CMAKE_CURRENT_SOURCE_DIR}/tools)
 
 add_custom_target(lint
                   ${PYTHON_EXECUTABLE}
diff --git a/cpp/src/gandiva/CMakeLists.txt b/cpp/src/gandiva/CMakeLists.txt
index 1831a57686fac..312ab84f65ee6 100644
--- a/cpp/src/gandiva/CMakeLists.txt
+++ b/cpp/src/gandiva/CMakeLists.txt
@@ -156,7 +156,8 @@ add_arrow_lib(gandiva
               ${GANDIVA_STATIC_LINK_LIBS}
               STATIC_INSTALL_INTERFACE_LIBS
               Arrow::arrow_static
-              LLVM::LLVM_HEADERS)
+              LLVM::LLVM_HEADERS
+              LLVM::LLVM_LIBS)
 
 foreach(LIB_TARGET ${GANDIVA_LIBRARIES})
   target_compile_definitions(${LIB_TARGET} PRIVATE GANDIVA_EXPORTING)