diff --git a/clang/test/dpct/cmp-cmds-linker-entry-src-files/Makefile b/clang/test/dpct/cmp-cmds-linker-entry-src-files/Makefile
index 4d3e5bc9b614..08b35795a38e 100644
--- a/clang/test/dpct/cmp-cmds-linker-entry-src-files/Makefile
+++ b/clang/test/dpct/cmp-cmds-linker-entry-src-files/Makefile
@@ -19,6 +19,7 @@ program = main
 #===============================================================================
 
 # Standard Flags
+EXTRA_CFLAGS = --generate-dependencies-with-compile --generate-nonsystem-dependencies-with-compile --allow-unsupported-compiler -allow-unsupported-compiler
 CFLAGS := $(EXTRA_CFLAGS) -std=c++14 -Xfatbin=-compress-all -Xfatbin -compress-all -Xcompiler -Wall -arch=$(ARCH)
 
 # Linker Flags
diff --git a/clang/tools/scan-build-py/lib/libscanbuild/compilation.py b/clang/tools/scan-build-py/lib/libscanbuild/compilation.py
index 939121076caf..7e076d64b1a2 100644
--- a/clang/tools/scan-build-py/lib/libscanbuild/compilation.py
+++ b/clang/tools/scan-build-py/lib/libscanbuild/compilation.py
@@ -190,6 +190,10 @@
     "--help" : 0,
     "-h" : 0,
     "--version" : 0,
+    "--generate-dependencies-with-compile" : 0,
+    "--generate-nonsystem-dependencies-with-compile" : 0,
+    "--allow-unsupported-compiler" : 0,
+    "-allow-unsupported-compiler"  : 0,
     "-V" : 0,
     #"-fopenmp": 0,
     "-forward-unknown-to-host-compiler" : 0,