From 105cf3cd1e06420d3b83897d20f1381d972fc66c Mon Sep 17 00:00:00 2001 From: Vinnie Falco Date: Sat, 22 Feb 2014 21:32:45 -0800 Subject: [PATCH] Revert "Tidy up build scripts:" This reverts commit 66b5f75142a2bc2bce2f6851ec8f1e9b05bcd280. --- SConstruct | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) diff --git a/SConstruct b/SConstruct index de58cd3ad2..2de9d57b00 100644 --- a/SConstruct +++ b/SConstruct @@ -113,7 +113,7 @@ BOOST_LIBS = [ # included the platform can be whitelisted. # if FreeBSD or Ubuntu or Archlinux: -if not (USING_CLANG and Linux) and (FreeBSD or Ubuntu or Debian or Archlinux or OSX): +if not (USING_CLANG and Linux) and (FreeBSD or Ubuntu or Archlinux or OSX): # non-mt libs do link with pthreads. env.Append( LIBS = BOOST_LIBS @@ -133,24 +133,6 @@ else: LIBS = [l + '-mt' for l in BOOST_LIBS] ) -#------------------------------------------------------------------------------- -# Change the way that information is printed so that we can get a nice -# output -#------------------------------------------------------------------------------- - -def print_cmd_line(s, target, src, env): - Tgt = (''.join([str(x) for x in target])) - - if ('build/rippled' == Tgt): - sys.stdout.write("Linking '\033[94m%s\033[0m'...\n" % Tgt) - elif ('tags' == Tgt): - sys.stdout.write("Generating tags...\n") - else: - sys.stdout.write("Compiling '\033[94m%s\033[0m'...\n" % \ - (' and '.join([str(x) for x in src]))) - -env['PRINT_CMD_LINE_FUNC'] = print_cmd_line - #------------------------------------------------------------------------------- # # VFALCO NOTE Clean area.