Index: clang/include/clang/Driver/Options.td =================================================================== --- clang/include/clang/Driver/Options.td +++ clang/include/clang/Driver/Options.td @@ -2285,6 +2285,8 @@ PosFlag, NegFlag, BothFlags<[NoXarchOption, CC1Option]>>; +def fmodule_output_EQ : Joined<["-"], "fmodule-output=">, Flags<[NoXarchOption, CC1Option]>, + HelpText<"Save intermediate module file results when compiling a standard C++ module unit.">; def fmodule_output : Flag<["-"], "fmodule-output">, Flags<[NoXarchOption, CC1Option]>, HelpText<"Save intermediate module file results when compiling a standard C++ module unit.">; Index: clang/lib/Driver/Driver.cpp =================================================================== --- clang/lib/Driver/Driver.cpp +++ clang/lib/Driver/Driver.cpp @@ -5541,15 +5541,21 @@ } // If `-fmodule-output` is specfied, then: + // - If `-fmodule-output` has a value, the module file is + // writing to the value. // - If `-o` is specified, the module file is written to the same path // with the output filename in module file's suffix. // - If `-o` is not specified, the module file is written to the working // direcotry with the input filename in module file's suffix. if (!AtTopLevel && isa(JA) && JA.getType() == types::TY_ModuleFile && - C.getArgs().hasArg(options::OPT_fmodule_output)) { + (C.getArgs().hasArg(options::OPT_fmodule_output) || + C.getArgs().hasArg(options::OPT_fmodule_output_EQ))) { SmallString<128> TempPath; - if (Arg *FinalOutput = C.getArgs().getLastArg(options::OPT_o)) + + if (Arg *ModuleFilePath = C.getArgs().getLastArg(options::OPT_fmodule_output_EQ)) + TempPath = ModuleFilePath->getValue(); + else if (Arg *FinalOutput = C.getArgs().getLastArg(options::OPT_o)) TempPath = FinalOutput->getValue(); else { llvm::sys::fs::current_path(TempPath); Index: clang/test/Driver/module-output.cppm =================================================================== --- clang/test/Driver/module-output.cppm +++ clang/test/Driver/module-output.cppm @@ -2,8 +2,14 @@ // output and the name of the .pcm file should be the same with the output file. // RUN: %clang -std=c++20 %s -fmodule-output -c -o %t/output/Hello.o \ // RUN: -### 2>&1 | FileCheck %s +// +// Tests that the .pcm file will be generated in the same path with the specified one in the comamnd line. +// RUN: %clang -std=c++20 %s -fmodule-output=%t/pcm/Hello.pcm -o %t/Hello.o \ +// RUN: -c -### 2>&1 | FileCheck %s --check-prefix=CHECK-SPECIFIED export module Hello; // CHECK: "-emit-module-interface" {{.*}}"-main-file-name" "module-output.cppm" {{.*}}"-o" "{{.*}}/Hello.pcm" "-x" "c++" "{{.*}}/module-output.cppm" // CHECK: "-emit-obj" {{.*}}"-main-file-name" "module-output.cppm" {{.*}}"-o" "{{.*}}/Hello.o" "-x" "pcm" "{{.*}}/Hello.pcm" +// CHECK-SPECIFIED: "-emit-module-interface" {{.*}}"-main-file-name" "module-output.cppm" {{.*}}"-o" "{{.*}}/Hello.pcm" "-x" "c++" "{{.*}}/module-output.cppm" +// CHECK-SPECIFIED: "-emit-obj" {{.*}}"-main-file-name" "module-output.cppm" {{.*}}"-o" "{{.*}}/Hello.o" "-x" "pcm" "{{.*}}/Hello.pcm"