[flang-commits] [flang] Revert "[flang] Add FLANG_PARALLEL_COMPILE_JOBS option" (PR #96000)
Tom Stellard via flang-commits
flang-commits at lists.llvm.org
Tue Jun 18 14:59:24 PDT 2024
https://github.com/tstellar created https://github.com/llvm/llvm-project/pull/96000
Reverts llvm/llvm-project#95672
This is failing on build configurations that use the CMakeLists.txt file from flang/runtime instead of flang/
>From 13a0c13519b356c004127cf23c79b57cd33fc969 Mon Sep 17 00:00:00 2001
From: Tom Stellard <tstellar at redhat.com>
Date: Tue, 18 Jun 2024 14:58:02 -0700
Subject: [PATCH] Revert "[flang] Add FLANG_PARALLEL_COMPILE_JOBS option
(#95672)"
This reverts commit 083c683969b2436afdc45becadc955841f5f4d31.
---
flang/CMakeLists.txt | 12 ------------
flang/cmake/modules/AddFlang.cmake | 1 -
2 files changed, 13 deletions(-)
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