diff --git a/wrappers/clang-target-wrapper.c b/wrappers/clang-target-wrapper.c
index 1c521bea..548d0bf0 100644
--- a/wrappers/clang-target-wrapper.c
+++ b/wrappers/clang-target-wrapper.c
@@ -56,6 +56,7 @@ int _tmain(int argc, TCHAR* argv[]) {
     if (getenv("CCACHE"))
         exec_argv[arg++] = _T("ccache");
     exec_argv[arg++] = concat(dir, _T(CLANG));
+    exec_argv[arg++] = _T("--start-no-unused-arguments");
 
     // If changing this wrapper, change clang-target-wrapper.sh accordingly.
     if (!_tcscmp(exe, _T("clang++")) || !_tcscmp(exe, _T("g++")) || !_tcscmp(exe, _T("c++")))
@@ -94,7 +95,7 @@ int _tmain(int argc, TCHAR* argv[]) {
     exec_argv[arg++] = _T("-unwindlib=libunwind");
     exec_argv[arg++] = _T("-stdlib=libc++");
     exec_argv[arg++] = _T("-fuse-ld=lld");
-    exec_argv[arg++] = _T("-Qunused-arguments");
+    exec_argv[arg++] = _T("--end-no-unused-arguments");
 
     for (int i = 1; i < argc; i++)
         exec_argv[arg++] = argv[i];
diff --git a/wrappers/clang-target-wrapper.sh b/wrappers/clang-target-wrapper.sh
index 4cac0619..6c586a0b 100755
--- a/wrappers/clang-target-wrapper.sh
+++ b/wrappers/clang-target-wrapper.sh
@@ -45,6 +45,7 @@ fi
 # If changing this wrapper, change clang-target-wrapper.c accordingly.
 CLANG="$DIR/clang"
 FLAGS=""
+FLAGS="$FLAGS --start-no-unused-arguments"
 case $EXE in
 clang++|g++|c++)
     FLAGS="$FLAGS --driver-mode=g++"
@@ -87,6 +88,6 @@ FLAGS="$FLAGS -rtlib=compiler-rt"
 FLAGS="$FLAGS -unwindlib=libunwind"
 FLAGS="$FLAGS -stdlib=libc++"
 FLAGS="$FLAGS -fuse-ld=lld"
-FLAGS="$FLAGS -Qunused-arguments"
+FLAGS="$FLAGS --end-no-unused-arguments"
 
 $CCACHE "$CLANG" $FLAGS "$@"