This is an archive of the discontinued LLVM Phabricator instance.

Differential D130074

[flang] Fix flang-to-external-fc --version
ClosedPublic

Authored by serge-sans-paille on Jul 19 2022, 4:00 AM.

Details

Reviewers
awarzynski
sscalpone
jdoerfert
Commits
rG90af9b4111d8: [flang] Fix flang-to-external-fc --version
Summary

Substitution of @FLANG_VERSION@ wasn't correctly performed.

Diff Detail

Event Timeline

serge-sans-paille created this revision.Jul 19 2022, 4:00 AM
Herald added a reviewer: sscalpone. · View Herald TranscriptJul 19 2022, 4:00 AM
Herald added projects: Restricted Project, Restricted Project. · View Herald Transcript
Herald added a subscriber: mgorny. · View Herald Transcript
serge-sans-paille requested review of this revision.Jul 19 2022, 4:00 AM
Herald added a reviewer: jdoerfert. · View Herald TranscriptJul 19 2022, 4:00 AM
Herald added subscribers: sstefan1, jdoerfert. · View Herald Transcript
Harbormaster completed remote builds in B176220: Diff 445772.Jul 19 2022, 4:21 AM
awarzynski added a comment.Jul 19 2022, 4:21 AM

My bad, thanks for fixing this! Fixes 55250

awarzynski accepted this revision.Jul 19 2022, 4:21 AM
This revision is now accepted and ready to land.Jul 19 2022, 4:21 AM
Closed by commit rG90af9b4111d8: [flang] Fix flang-to-external-fc --version (authored by serge-sans-paille). · Explain WhyJul 19 2022, 5:11 AM
This revision was automatically updated to reflect the committed changes.
serge-sans-paille added a commit: rG90af9b4111d8: [flang] Fix flang-to-external-fc --version.

Revision Contents

PathSize
flang/
tools/
f18/
9 lines
flang-to-external-fc.in
flang-to-external-fc

Diff 445787

flang/tools/f18/CMakeLists.txt

Show First 20 Lines • Show All 44 Lines • ▼ Show 20 Linesforeach(filename ${MODULES})
list(APPEND MODULE_FILES ${base}.mod ${base}.f18.mod) list(APPEND MODULE_FILES ${base}.mod ${base}.f18.mod)
install(FILES ${base}.mod ${base}.f18.mod DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/flang") install(FILES ${base}.mod ${base}.f18.mod DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/flang")
endforeach() endforeach()
add_custom_target(module_files ALL DEPENDS ${MODULE_FILES}) add_custom_target(module_files ALL DEPENDS ${MODULE_FILES})
# This flang shell script will only work in a POSIX shell. # This flang shell script will only work in a POSIX shell.
if (NOT WIN32) if (NOT WIN32)
add_custom_command( configure_file(
OUTPUT ${CMAKE_BINARY_DIR}/bin/flang-to-external-fc ${CMAKE_CURRENT_SOURCE_DIR}/flang-to-external-fc.in
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/flang-to-external-fc ${CMAKE_BINARY_DIR}/bin/flang-to-external-fc
COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/flang-to-external-fc ${CMAKE_BINARY_DIR}/bin) @ONLY
)
add_custom_target(flang-to-external-fc ALL DEPENDS ${CMAKE_BINARY_DIR}/bin/flang-to-external-fc) add_custom_target(flang-to-external-fc ALL DEPENDS ${CMAKE_BINARY_DIR}/bin/flang-to-external-fc)
install(PROGRAMS ${CMAKE_BINARY_DIR}/bin/flang-to-external-fc DESTINATION "${CMAKE_INSTALL_BINDIR}") install(PROGRAMS ${CMAKE_BINARY_DIR}/bin/flang-to-external-fc DESTINATION "${CMAKE_INSTALL_BINDIR}")
endif() endif()
# TODO Move this to a more suitable location # TODO Move this to a more suitable location
file(COPY ${FLANG_SOURCE_DIR}/module/omp_lib.h DESTINATION "${CMAKE_BINARY_DIR}/include/flang/OpenMP/" FILE_PERMISSIONS OWNER_READ OWNER_WRITE) file(COPY ${FLANG_SOURCE_DIR}/module/omp_lib.h DESTINATION "${CMAKE_BINARY_DIR}/include/flang/OpenMP/" FILE_PERMISSIONS OWNER_READ OWNER_WRITE)

flang/tools/f18/flang-to-external-fc

  • This file was moved to flang/tools/f18/flang-to-external-fc.in.

flang/tools/f18/flang-to-external-fc.in

  • This file was moved from flang/tools/f18/flang-to-external-fc.
The contents of this file were not changed.