Index: compiler-rt/lib/ubsan/ubsan_init.cc
===================================================================
--- compiler-rt/lib/ubsan/ubsan_init.cc
+++ compiler-rt/lib/ubsan/ubsan_init.cc
@@ -40,8 +40,8 @@
 
 static void CommonStandaloneInit() {
   SanitizerToolName = GetSanititizerToolName();
-  InitializeFlags();
   CacheBinaryName();
+  InitializeFlags();
   __sanitizer_set_report_path(common_flags()->log_path);
   AndroidLogInit();
   InitializeCoverage(common_flags()->coverage, common_flags()->coverage_dir);
Index: compiler-rt/test/sanitizer_common/TestCases/options-include.cc
===================================================================
--- compiler-rt/test/sanitizer_common/TestCases/options-include.cc
+++ compiler-rt/test/sanitizer_common/TestCases/options-include.cc
@@ -1,5 +1,4 @@
 // RUN: %clangxx -O0 %s -o %t
-// UNSUPPORTED: ubsan
 
 // Recursive include: options1 includes options2
 // RUN: echo "symbolize=1" > %t.options1.txt