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

toolchain_build/command.py

Index: toolchain_build/command.py
diff --git a/toolchain_build/command.py b/toolchain_build/command.py
index c39f28f5c8adb2b3b05c522ce2422e3eae4118c4..bea6fd8d9c12b3c0253e348545bda289ba3f9236 100755
--- a/toolchain_build/command.py
+++ b/toolchain_build/command.py
@@ -196,7 +196,13 @@ def Command(command, stdout=None, run_cond=None, **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)