diff --git a/compiler-rt/test/xray/lit.cfg b/compiler-rt/test/xray/lit.cfg
index c0eeea0cf074..d5e40975da56 100644
--- a/compiler-rt/test/xray/lit.cfg
+++ b/compiler-rt/test/xray/lit.cfg
@@ -20,13 +20,6 @@ def build_invocation(compile_flags):
 llvm_xray = os.path.join(config.llvm_tools_dir, 'llvm-xray')
 
 # Setup substitutions.
-xraylib_flags = '-lm -pthread -lrt'
-if config.host_os == 'Linux':
-  xraylib_flags += ' -ldl'
-
-xraylib_flags += ' -L%s -Wl,-whole-archive -lclang_rt.xray-%s '
-'-Wl,-no-whole-archive'
-  
 config.substitutions.append(
     ('%clang ', build_invocation([config.target_cflags])))
 config.substitutions.append(
@@ -40,13 +33,14 @@ config.substitutions.append(
     ('%llvm_xray', llvm_xray))
 config.substitutions.append(
     ('%xraylib',
-        (xraylib_flags)
+        ('-lm -lpthread -ldl -lrt -L%s '
+         '-Wl,-whole-archive -lclang_rt.xray-%s -Wl,-no-whole-archive')
         % (config.compiler_rt_libdir, config.host_arch)))
 
 # Default test suffixes.
 config.suffixes = ['.c', '.cc', '.cpp']
 
-if config.host_os not in ['Linux', 'FreeBSD']:
+if config.host_os not in ['Linux']:
   config.unsupported = True
 elif '64' not in config.host_arch:
   if 'arm' in config.host_arch: