Have CMake LLVM build share CFLAGS/CXXFLAGS with autoconf (e.g., libc++ flags).

toolchain_build/command.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.
 
 """Class capturing a command invocation as data."""
 
 import inspect
 import glob
 import hashlib
@@ skipping 178 matching lines @@
     cwd = subst.SubstituteAbsPaths(check_call_kwargs.get('cwd', '.'))
     subst.SetCwd(cwd)
     check_call_kwargs['cwd'] = cwd
 
     # Extract paths from kwargs and add to the command environment.
     path_dirs = []
     if 'path_dirs' in check_call_kwargs:
       path_dirs = [subst.Substitute(dirname) for dirname
                    in check_call_kwargs['path_dirs']]
       del check_call_kwargs['path_dirs']
-    check_call_kwargs['env'] = PlatformEnvironment(path_dirs)
+    # Perform substitution on any env overrides.
+    if 'env' in check_call_kwargs:
+      check_call_kwargs['env'] = { k: subst.Substitute(v)
+            for (k, v) in check_call_kwargs['env'].iteritems() }
+      check_call_kwargs['env'].update(PlatformEnvironment(path_dirs))

[Derek Schuff, 2015/03/10 21:09:45]

can you do a run with --emit-signatures=foo and ensure that this argument shows
up in the hash? looking at Runnable's ReprForHash above, I'm not sure that it
will.

[jvoung (off chromium), 2015/03/10 22:30:18]

The "foo" file has:

======================================================================
****************************** PACKAGE SIGNATURE ******************************
package:llvm_x86_64_linux
summary:[('platform', 'linux2'), ('machine', 'x86_64') ...

//...

command:
['cmake', '-G', 'Ninja',
'-DCMAKE_C_COMPILER=/usr/local/google/home/jvoung/nacl4/third_party/llvm-build/Release+Asserts/bin/clang',
'-DCMAKE_CXX_COMPILER=/usr/local/google/home/jvoung/na
cl4/third_party/llvm-build/Release+Asserts/bin/clang++',
'-DHAVE_SANITIZER_MSAN_INTERFACE_H=FALSE', '-DCMAKE_C_FLAGS=',
'-DCMAKE_CXX_FLAGS=-stdlib=libc++ -I%(abs_libcxx_x86_64_linux)s/in
clude/c++/v1', '-DCMAKE_EXE_LINKER_FLAGS=-L%(abs_libcxx_x86_64_linux)s/lib',
'-DCMAKE_SHARED_LINKER_FLAGS=-L%(abs_libcxx_x86_64_linux)s/lib',
'-DCMAKE_MODULE_LINKER_FLAGS=-L%(abs_libcxx_
x86_64_linux)s/lib', '-DBUILD_SHARED_LIBS=ON', '-DCMAKE_BUILD_TYPE=Release',
'-DCMAKE_INSTALL_PREFIX=%(output)s', '-DCMAKE_INSTALL_RPATH=$ORIGIN/../lib',
'-DLLVM_APPEND_VC_REV=ON', '-DLL
VM_BINUTILS_INCDIR=%(abs_binutils_pnacl_src)s/include', '-DLLVM_BUILD_TESTS=ON',
'-DLLVM_ENABLE_ASSERTIONS=ON', '-DLLVM_ENABLE_LIBCXX=OFF',
'-LLVM_ENABLE_WERROR=ON', '-DLLVM_ENABLE_ZLIB=
OFF', '-DLLVM_EXTERNAL_CLANG_SOURCE_DIR=%(clang_src)s',
'-DLLVM_EXTERNAL_SUBZERO_SOURCE_DIR=%(subzero_src)s',
'-DLLVM_TARGETS_TO_BUILD=X86;ARM;Mips', '%(llvm_src)s']
None
'env'
{'LDFLAGS': '-L%(abs_libcxx_x86_64_linux)s/lib'}
2865a36ac1d32273867d26a708f61378ce3e70f0
command:
'lib'
2865a36ac1d32273867d26a708f61378ce3e70f0
command:
'%(abs_libcxx_x86_64_linux)s/lib/libc++.so.1'
'lib/libc++.so.1'
2865a36ac1d32273867d26a708f61378ce3e70f0
command:
['ninja', '-v']
None
// ...

So 'env': {'LDFLAGS': ...} shows up.

====

In Runnable __str__, there is a loop over kwargs:

  values += [repr(k), ReprForHash(v)]

+    else:
+      check_call_kwargs['env'] = PlatformEnvironment(path_dirs)
 
     if isinstance(command, str):
       command = subst.Substitute(command)
     else:
       command = [subst.Substitute(arg) for arg in command]
       paths = check_call_kwargs['env']['PATH'].split(os.pathsep)
       command[0] = pynacl.file_tools.Which(command[0], paths=paths)
 
     if stdout is not None:
       stdout = subst.SubstituteAbsPaths(stdout)
@@ skipping 378 matching lines @@
 # It describes how to unpack and apply patches to produce the source
 # tree of the %(name)s component of a toolchain targetting Native Client.
 
 # Source: %(upstream-name)s.tar
 """
               % info)
       for patch in patch_files:
         f.write('\n# %s\n%s\n' % patch)
 
   return Runnable(run_cond, generatePatches, git_dir, info)