[flang-commits] [flang] 0f323dc - Revert "[flang] Add FLANG_PARALLEL_COMPILE_JOBS option" (#96000)
via flang-commits
flang-commits at lists.llvm.org
Tue Jun 18 14:59:31 PDT 2024
Author: Tom Stellard
Date: 2024-06-18T14:59:28-07:00
New Revision: 0f323dc0c43bd45147bdf8ee9cbeef0d8f57165b
URL: https://github.com/llvm/llvm-project/commit/0f323dc0c43bd45147bdf8ee9cbeef0d8f57165b
DIFF: https://github.com/llvm/llvm-project/commit/0f323dc0c43bd45147bdf8ee9cbeef0d8f57165b.diff
LOG: Revert "[flang] Add FLANG_PARALLEL_COMPILE_JOBS option" (#96000)
Reverts llvm/llvm-project#95672
This is failing on build configurations that use the CMakeLists.txt file
from flang/runtime instead of flang/
Added:
Modified:
flang/CMakeLists.txt
flang/cmake/modules/AddFlang.cmake
Removed:
################################################################################
diff --git a/flang/CMakeLists.txt b/flang/CMakeLists.txt
index 75db5b93d4dbe..cbe8f1186236a 100644
--- a/flang/CMakeLists.txt
+++ b/flang/CMakeLists.txt
@@ -445,18 +445,6 @@ if (APPLE)
endif()
endif()
-# Set up job pools for flang. Some of the flang sources take a lot of memory to
-# compile, so allow users to limit the number of parallel flang jobs. This is
-# useful for building flang alongside several other projects since you can use
-# the maximum number of build jobs for the other projects while limiting the
-# number of flang compile jobs.
-#
-# We want this set to infinity by default
-set(FLANG_PARALLEL_COMPILE_JOBS 0 CACHE STRING
- "The maximum number of concurrent compilation jobs (Ninja only)")
-
-set_property(GLOBAL APPEND PROPERTY JOB_POOLS flang_compile_job_pool=${FLANG_PARALLEL_COMPILE_JOBS})
-
include(CMakeParseArguments)
include(AddFlang)
diff --git a/flang/cmake/modules/AddFlang.cmake b/flang/cmake/modules/AddFlang.cmake
index c4b957324ea1c..3a5119b83831f 100644
--- a/flang/cmake/modules/AddFlang.cmake
+++ b/flang/cmake/modules/AddFlang.cmake
@@ -89,7 +89,6 @@ function(add_flang_library name)
set_property(GLOBAL APPEND PROPERTY FLANG_LIBS ${name})
endif()
set_property(GLOBAL APPEND PROPERTY FLANG_EXPORTS ${name})
- set_property(TARGET obj.${name} PROPERTY JOB_POOL_COMPILE flang_compile_job_pool)
else()
# Add empty "phony" target
add_custom_target(${name})
More information about the flang-commits
mailing list