Skip to content

Commit c850814

Browse files
everythingfunctionalh-vetinaribanach-space
committed
[flang][driver] restore flang-new as symlink
Restore flang-new as a symlink to flang for backwards compatibility Co-authored-by: H. Vetinari <[email protected]> Co-authored-by: Andrzej Warzynski <[email protected]>
1 parent 1e76b6c commit c850814

File tree

3 files changed

+9
-1
lines changed

3 files changed

+9
-1
lines changed

clang/lib/Driver/ToolChain.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -381,6 +381,9 @@ static const DriverSuffix *FindDriverSuffix(StringRef ProgName, size_t &Pos) {
381381
{"cl", "--driver-mode=cl"},
382382
{"++", "--driver-mode=g++"},
383383
{"flang", "--driver-mode=flang"},
384+
// For backwards compatibility, we create a symlink for `flang` called
385+
// `flang-new`. This will be removed in the future.
386+
{"flang-new", "--driver-mode=flang"},
384387
{"clang-dxc", "--driver-mode=dxc"},
385388
};
386389

flang/tools/flang-driver/CMakeLists.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,3 +36,7 @@ if(FLANG_PLUGIN_SUPPORT)
3636
endif()
3737

3838
install(TARGETS flang DESTINATION "${CMAKE_INSTALL_BINDIR}")
39+
40+
# Keep "flang-new" as a symlink for backwards compatiblity. Remove once "flang"
41+
# is a widely adopted name.
42+
add_flang_symlink(flang-new flang)

flang/tools/flang-driver/driver.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,8 @@ int main(int argc, const char **argv) {
8888
llvm::InitLLVM x(argc, argv);
8989
llvm::SmallVector<const char *, 256> args(argv, argv + argc);
9090

91-
clang::driver::ParsedClangName targetandMode("flang", "--driver-mode=flang");
91+
clang::driver::ParsedClangName targetandMode =
92+
clang::driver::ToolChain::getTargetAndModeFromProgramName(argv[0]);
9293
std::string driverPath = getExecutablePath(args[0]);
9394

9495
llvm::BumpPtrAllocator a;

0 commit comments

Comments
 (0)