Make chrome_browser_tests work with irt=0 again

SConstruct

 # -*- python -*-
 # Copyright (c) 2011 The Native Client Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import atexit
 import glob
 import os
 import platform
 import stat
@@ skipping 2536 matching lines @@
 target_variant_map = [
     ('bitcode', 'pnacl'),
     ('nacl_pic', 'pic'),
     ('use_sandboxed_translator', 'sbtc'),
     ('nacl_glibc', 'glibc'),
     ]
 for variant_bit, variant_suffix in target_variant_map:
   if nacl_env.Bit(variant_bit):
     nacl_env['TARGET_VARIANT'] += '-' + variant_suffix
 
-# Since the default linking layout is compatible with IRT loading now,
-# we should not need anything special here.
-# TODO(mcgrathr): Perhaps remove the variable entirely at some point.
-nacl_env.Replace(NON_PPAPI_BROWSER_LIBS=[])
-
 if nacl_env.Bit('irt'):
+  # Since the default linking layout is compatible with IRT loading now,
+  # we should not need anything special here.
+  nacl_env.Replace(NON_PPAPI_BROWSER_LIBS=[])
   nacl_env.Replace(PPAPI_LIBS=['ppapi'])
-  # Even non-PPAPI nexes need this for IRT-compatible linking.
-  # We don't just make them link with ${PPAPI_LIBS} because in
-  # the non-IRT case under dynamic linking, that tries to link
-  # in libppruntime.so with its undefined symbols and fails
-  # for nexes that aren't actually PPAPI users.
 else:
   # TODO(mseaborn): This will go away when we only support using PPAPI

[bsy, 2011/08/16 22:01:15]

i think this comment is out of date.  we need this to test service runtime
interfaces that is used by the IRT, so even when we only support PPAPI with IRT,
this is still needed.

   # via the IRT library, so users of this dependency should not rely
   # on individual libraries like 'platform' being included by default.
+  nacl_env.Replace(NON_PPAPI_BROWSER_LIBS=['${NONIRT_LIBS}'])
   nacl_env.Replace(PPAPI_LIBS=['ppruntime', 'srpc', 'imc', 'imc_syscalls',
-                               'platform', 'gio', 'pthread', 'm'])
+                               'platform', 'gio', '${PTHREAD_LIBS}', 'm',
+                               '${NONIRT_LIBS}'])
 
 # TODO(mseaborn): Make nacl-glibc-based static linking work with just
 # "-static", without specifying a linker script.
 # See http://code.google.com/p/nativeclient/issues/detail?id=1298
 def GetLinkerScriptBaseName(env):
   if env.Bit('build_x86_64'):
     return 'elf64_nacl'
   else:
     return 'elf_nacl'
 
@@ skipping 628 matching lines @@
   nacl_env.ValidateSdk()
 
 if BROKEN_TEST_COUNT > 0:
   msg = "There are %d broken tests." % BROKEN_TEST_COUNT
   if GetOption('brief_comstr'):
     msg += " Add --verbose to the command line for more information."
   print msg
 
 # separate warnings from actual build output
 Banner('B U I L D - O U T P U T:')