[compiler-rt] r325309 - Revert part of SVN r. 325240 in lit.cfg

[Kamil Rytarowski via llvm-commits]

Author: kamil
Date: Thu Feb 15 17:16:06 2018
New Revision: 325309

URL: http://llvm.org/viewvc/llvm-project?rev=325309&view=rev
Log:
Revert part of SVN r. 325240 in lit.cfg

The original change broke a llvm-clang-lld-x86_64-debian setup.

This change will be investigated and reintroduced in future.

Original commit:

  "Add Xray instrumentation support to FreeBSD"
  https://reviews.llvm.org/D43278

Modified:
    compiler-rt/trunk/test/xray/lit.cfg

Modified: compiler-rt/trunk/test/xray/lit.cfg
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/xray/lit.cfg?rev=325309&r1=325308&r2=325309&view=diff
==============================================================================
--- compiler-rt/trunk/test/xray/lit.cfg (original)
+++ compiler-rt/trunk/test/xray/lit.cfg Thu Feb 15 17:16:06 2018
@@ -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: