This is an archive of the discontinued LLVM Phabricator instance.

Differential D146173

Flang cmake patch to handle LLVM_ENABLE_EH conflict (issue #59353)
ClosedPublic

Authored by pmccormick on Mar 15 2023, 3:43 PM.

Details

Reviewers
sscalpone
kiranchandramohan
awarzynski
klausler
clementval
jeanPerier
PeteSteinfeld
tarunprabhu
AlexisPerry
Commits
rGf7e58c91587b: [flang] Raise configure-time error when LLVM_ENABLE_EH is set
Summary

A quick fix to address issue #59353.

High-level summary: don't allow Flang to build/configure when LLVM_ENABLE_EH is set.

As mentioned in the issue, this is aligned with the flang style guidelines (no exceptions). We have a couple of recent use cases (e..g, the spack managed install of llvm) that are actually producing versions of Flang w/ the link time failures mentioned in this issue.

Diff Detail

Event Timeline

pmccormick created this revision.Mar 15 2023, 3:43 PM
Herald added a project: Restricted Project. · View Herald TranscriptMar 15 2023, 3:43 PM
Herald added subscribers: sunshaoce, jdoerfert. · View Herald Transcript
pmccormick requested review of this revision.Mar 15 2023, 3:43 PM
klausler accepted this revision.Mar 15 2023, 3:44 PM

LGTM and thanks!

This revision is now accepted and ready to land.Mar 15 2023, 3:44 PM
Harbormaster completed remote builds in B219741: Diff 505592.Mar 15 2023, 4:01 PM
pmccormick updated this revision to Diff 516548.Apr 24 2023, 3:07 PM

Rebased to capture latest state.

Harbormaster completed remote builds in B227828: Diff 516548.Apr 24 2023, 3:25 PM
This revision was landed with ongoing or failed builds.Apr 26 2023, 1:08 PM
Closed by commit rGf7e58c91587b: [flang] Raise configure-time error when LLVM_ENABLE_EH is set (authored by pmccormick, committed by tarunprabhu). · Explain Why
This revision was automatically updated to reflect the committed changes.
tarunprabhu added a commit: rGf7e58c91587b: [flang] Raise configure-time error when LLVM_ENABLE_EH is set.

Revision Contents

PathSize
flang/
8 lines

Diff 516548

flang/CMakeLists.txt

cmake_minimum_required(VERSION 3.13.4) cmake_minimum_required(VERSION 3.13.4)
if(NOT DEFINED LLVM_COMMON_CMAKE_UTILS) if(NOT DEFINED LLVM_COMMON_CMAKE_UTILS)
set(LLVM_COMMON_CMAKE_UTILS ${CMAKE_CURRENT_SOURCE_DIR}/../cmake) set(LLVM_COMMON_CMAKE_UTILS ${CMAKE_CURRENT_SOURCE_DIR}/../cmake)
endif() endif()
include(${LLVM_COMMON_CMAKE_UTILS}/Modules/CMakePolicy.cmake include(${LLVM_COMMON_CMAKE_UTILS}/Modules/CMakePolicy.cmake
NO_POLICY_SCOPE) NO_POLICY_SCOPE)
set(CMAKE_BUILD_WITH_INSTALL_NAME_DIR ON) set(CMAKE_BUILD_WITH_INSTALL_NAME_DIR ON)
# Flang requires C++17. # Flang requires C++17.
set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD_REQUIRED TRUE) set(CMAKE_CXX_STANDARD_REQUIRED TRUE)
set(CMAKE_CXX_EXTENSIONS OFF) set(CMAKE_CXX_EXTENSIONS OFF)
if (LLVM_ENABLE_EH)
# To match with the flang guidelines we currently disable
# building with exception support in core LLVM.
message(FATAL_ERROR "Flang does not currently support building with \
LLVM exceptions enabled. Please disable LLVM_ENABLE_EH when building \
flang.")
endif()
set(FLANG_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}) set(FLANG_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
if (CMAKE_SOURCE_DIR STREQUAL CMAKE_BINARY_DIR AND NOT MSVC_IDE) if (CMAKE_SOURCE_DIR STREQUAL CMAKE_BINARY_DIR AND NOT MSVC_IDE)
message(FATAL_ERROR "In-source builds are not allowed. \ message(FATAL_ERROR "In-source builds are not allowed. \
Please create a directory and run cmake from there,\ Please create a directory and run cmake from there,\
passing the path to this source directory as the last argument.\ passing the path to this source directory as the last argument.\
This process created the file `CMakeCache.txt' and the directory\ This process created the file `CMakeCache.txt' and the directory\
`CMakeFiles'. Please delete them.") `CMakeFiles'. Please delete them.")
▲ Show 20 Lines • Show All 467 Lines • Show Last 20 Lines