MinSFI: Passing arguments to the entry function

site_scons/site_tools/naclsdk.py

 #!/usr/bin/python
 # Copyright (c) 2012 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.
 
 """NaCl SDK tool SCons."""
 
 import __builtin__
 import re
 import os
@@ skipping 219 matching lines @@
   if env.Bit('nacl_pic'):
     pnacl_cc_flags += ' -fPIC'
     pnacl_cxx_flags += ' -fPIC'
     # NOTE: this is a special hack for the pnacl backend which
     #       does more than linking
     pnacl_ld_flags += ' -fPIC'
     pnacl_translate_flags += ' -fPIC'
 
   if env.Bit('minsfi'):
     pnacl_llc_flags += ' -relocation-model=pic -filetype=obj'
-    pnacl_ld_flags += ' -nostdlib -Wl,-r'
+    pnacl_ld_flags += ' -nostdlib -Wl,-r -L' + os.path.join(root, 'usr', 'lib')
 
   if env.Bit('use_sandboxed_translator'):
     sb_flags = ' --pnacl-sb'
     pnacl_ld_flags += sb_flags
     pnacl_translate_flags += sb_flags
 
   if env.Bit('x86_64_zero_based_sandbox'):
     pnacl_translate_flags += ' -sfi-zero-based-sandbox'
 
   env.Replace(# Replace header and lib paths.
@@ skipping 454 matching lines @@
     # translation.
     if not os.path.exists(version_file) or env.Bit('use_sandboxed_translator'):
       version_file = os.path.join(os.path.dirname(root), 'pnacl_translator',
                                   'FEATURE_VERSION')
     if os.path.exists(version_file):
       with open(version_file, 'r') as fh:
         version = int(fh.read())
     else:
       version = 0
   env.Replace(TOOLCHAIN_FEATURE_VERSION=version)