diff --git a/compiler-rt/test/ubsan_minimal/lit.common.cfg b/compiler-rt/test/ubsan_minimal/lit.common.cfg
index ab0eb9720a97..e8b42bb823c8 100644
--- a/compiler-rt/test/ubsan_minimal/lit.common.cfg
+++ b/compiler-rt/test/ubsan_minimal/lit.common.cfg
@@ -34,7 +34,7 @@ if config.host_os not in ['Linux', 'FreeBSD', 'NetBSD', 'Darwin']: # TODO: Windo
   config.unsupported = True
 
 # Don't target x86_64h if the test machine can't execute x86_64h binaries.
-if config.target_arch == 'x86_64h' and 'x86_64h' not in config.available_features:
+if '-arch x86_64h' in target_cflags and 'x86_64h' not in config.available_features:
   config.unsupported = True
 
 config.available_features.add('arch=' + config.target_arch)