Make sel_ldr buildable without Chromium stuff

Only for amd64 host and target. nacl_helper_bootstrap also builds.

- Check in linux_syscall_support.h (like we did for Breakpad)
- Add a hacky symlink so we don't have to include the repository's
  parent directory or name it "native_client"
- Use LLVM from /usr/bin instead of Chromium toolchains
- Remove sysroot flags (depend on host system instead)
- Disable setup of NaCl-target toolchains in scons scripts

Author: slipher

README.md

@@ -1,3 +1,18 @@
+Fork of https://chromium.googlesource.com/native_client/src/native_client
+with edits to enable building NaCl without the Chromium
+dev tools. History had to be cut off due to 200 MB zip files in the history.
+Currently it only works for amd64 host+target. (run.py won't work
+since NaCl targets aren't supported yet.)
+Dependencies:
+- LLVM (must be installed in /usr/bin)
+- SCons
+
+Build with:
+```
+scons platform=x86-64 MODE=opt-host naclsdk_validate=0 sysinfo=0 sel_ldr
+```
+---
+
 #  Native Client
 
 Native Client is a deprecated sandboxing technology. It is currently used by a

SConstruct

@@ -34,6 +34,8 @@ import pynacl.platform
 import gc
 gc.disable()
 
+nacltool = False # Daemon: not yet implemented
+
 # REPORT
 CMD_COUNTER = {}
 ENV_COUNTER = {}
@@ -468,8 +470,8 @@ pre_base_env = Environment(
     # This allows in things like externally provided PATH, PYTHONPATH.
     ENV = os.environ.copy(),
     tools = ['component_setup'],
-    # SOURCE_ROOT is one leave above the native_client directory.
-    SOURCE_ROOT = Dir('#/..').abspath,
+    # In upstream this is the "depot" dir (parent dir of repositories)
+    SOURCE_ROOT = Dir('#/include-hax').abspath,
     # Publish dlls as final products (to staging).
     COMPONENT_LIBRARY_PUBLISH = True,
 
@@ -2212,7 +2214,7 @@ Automagically generated help:
 
 
 def SetUpClang(env):
-  env['CLANG_DIR'] = '${SOURCE_ROOT}/third_party/llvm-build/Release+Asserts/bin'
+  env['CLANG_DIR'] = '/usr/bin'
   env['CLANG_OPTS'] = []
   if env.Bit('asan'):
     if not (env.Bit('host_linux') or env.Bit('host_mac')):
@@ -2709,8 +2711,8 @@ def MakeGenericLinuxEnv(platform=None):
     sysroot=os.path.join(
       '${SOURCE_ROOT}/build/linux/debian_bullseye_amd64-sysroot')
     linux_env.Prepend(
-        CCFLAGS = ['-m64', '--sysroot='+sysroot],
-        LINKFLAGS = ['-m64', '--sysroot='+sysroot],
+        CCFLAGS = ['-m64'],#, '--sysroot='+sysroot],
+        LINKFLAGS = ['-m64']#, '--sysroot='+sysroot],
         )
   elif linux_env.Bit('build_arm'):
     SetUpLinuxEnvArm(linux_env)
@@ -2796,7 +2798,7 @@ pre_base_env.Append(
 nacl_env = MakeArchSpecificEnv()
 # See comment below about libc++ and libpthread in NONIRT_LIBS.
 using_nacl_libcxx = nacl_env.Bit('bitcode') or nacl_env.Bit('nacl_clang')
-nacl_env = nacl_env.Clone(
+if nacltool: nacl_env = nacl_env.Clone(
     tools = ['naclsdk'],
     NACL_BUILD_FAMILY = 'UNTRUSTED',
     BUILD_TYPE = 'nacl',
@@ -3136,7 +3138,7 @@ if nacl_env.Bit('running_on_valgrind'):
     nacl_env.Append(LINKFLAGS = ['-Wl,-u,have_nacl_valgrind_interceptors'],
                     LIBS = ['valgrind'])
 
-environment_list.append(nacl_env)
+if nacltool: environment_list.append(nacl_env)
 
 if not nacl_env.Bit('nacl_glibc'):
   # These are all specific to nacl-newlib so we do not include them
@@ -3390,11 +3392,11 @@ nacl_irt_env.ClearBits('bitcode')
 # used to build user/test code. nacl-clang is used everywhere for the IRT.
 nacl_irt_env.SetBits('nacl_clang')
 
-nacl_irt_env.Tool('naclsdk')
+if nacltool: nacl_irt_env.Tool('naclsdk')
 # These are unfortunately clobbered by running Tool, which
 # we needed to do to get the destination directory reset.
 # We want all the same values from nacl_env.
-nacl_irt_env.Replace(EXTRA_CFLAGS=nacl_env['EXTRA_CFLAGS'],
+if nacltool: nacl_irt_env.Replace(EXTRA_CFLAGS=nacl_env['EXTRA_CFLAGS'],
                      EXTRA_CXXFLAGS=nacl_env['EXTRA_CXXFLAGS'],
                      CCFLAGS=nacl_env['CCFLAGS'],
                      CFLAGS=nacl_env['CFLAGS'],
@@ -3415,7 +3417,7 @@ if nacl_irt_env.Bit('build_x86_32'):
 # The IRT is C only, don't link with the C++ linker so that it doesn't
 # start depending on the C++ standard library and (in the case of
 # libc++) pthread.
-nacl_irt_env.Replace(LINK=(nacl_irt_env['LINK'].
+if nacltool: nacl_irt_env.Replace(LINK=(nacl_irt_env['LINK'].
                            replace('nacl-clang++', 'nacl-clang')))
 
 # TODO(mcgrathr): Clean up uses of these methods.
@@ -3531,8 +3533,8 @@ def AddImplicitLibs(env):
     # The -B<dir>/ flag is necessary to tell gcc to look for crt[1in].o there.
     env.Prepend(LINKFLAGS=['-B${LIB_DIR}/'])
 
-AddImplicitLibs(nacl_env)
-AddImplicitLibs(nacl_irt_env)
+if nacltool: AddImplicitLibs(nacl_env)
+if nacltool: AddImplicitLibs(nacl_irt_env)
 
 nacl_irt_env.Append(
     BUILD_SCONSCRIPTS = [
@@ -3547,7 +3549,7 @@ nacl_irt_env.Append(
     ])
 nacl_irt_env.AddChromeFilesFromGroup('untrusted_irt_scons_files')
 
-environment_list.append(nacl_irt_env)
+if nacltool: environment_list.append(nacl_irt_env)
 
 # Since browser_tests already use the IRT normally, those are fully covered
 # in nacl_env.  But the non_browser_tests don't use the IRT in nacl_env.
@@ -3612,7 +3614,7 @@ def IrtTestAddNodeToTestSuite(env, node, suite_name, node_name=None,
                             is_broken, is_flaky)
 nacl_irt_test_env.AddMethod(IrtTestAddNodeToTestSuite, 'AddNodeToTestSuite')
 
-environment_list.append(nacl_irt_test_env)
+if nacltool: environment_list.append(nacl_irt_test_env)
 
 
 windows_coverage_env = windows_debug_env.Clone(

include-hax/native_client

@@ -0,0 +1 @@
+..