diff --git a/infer/lib/xcode_wrappers/clang b/infer/lib/xcode_wrappers/clang
index 62f78657e..ab7360148 100755
--- a/infer/lib/xcode_wrappers/clang
+++ b/infer/lib/xcode_wrappers/clang
@@ -6,6 +6,4 @@ BIN_PATH="${SCRIPT_PATH}/../../bin"
 if [ "${0%++}" != "$0" ]; then INFER_XX="++"; fi
 export INFER_XX
 
-EXTRA_ARGS=-fno-cxx-modules
-
-"${BIN_PATH}/InferClang" "$@" $EXTRA_ARGS
+"${BIN_PATH}/InferClang" "$@"
diff --git a/infer/src/clang/InferClang.re b/infer/src/clang/InferClang.re
index 34ecd9102..3c658ccb6 100644
--- a/infer/src/clang/InferClang.re
+++ b/infer/src/clang/InferClang.re
@@ -21,9 +21,10 @@ let normalize (args: array string) :list ClangCommand.t =>
     Logging.out "InferClang got toplevel -cc1 command@\n";
     [ClangCommand.CC1 args]
   | NonCCCommand args =>
+    let args' = ClangCommand.append_args ["-fno-cxx-modules"] args;
     let clang_hashhashhash =
       Printf.sprintf
-        "%s 2>&1" (ClangCommand.prepend_arg "-###" args |> ClangCommand.command_to_run);
+        "%s 2>&1" (ClangCommand.prepend_arg "-###" args' |> ClangCommand.command_to_run);
     Logging.out "clang -### invocation: %s@\n" clang_hashhashhash;
     let normalized_commands = ref [];
     let one_line line =>