toolchain_build/command.py - Issue 978963002: Have CMake LLVM build share CFLAGS/CXXFLAGS with autoconf (e.g., libc++ flags).

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: toolchain_build/command.py

Issue 978963002: Have CMake LLVM build share CFLAGS/CXXFLAGS with autoconf (e.g., libc++ flags). (Closed) Base URL: https://chromium.googlesource.com/native_client/src/native_client.git@master

Patch Set: toggle more types of linker flags Created 5 years, 9 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

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))

+ else:

+ check_call_kwargs['env'] = PlatformEnvironment(path_dirs)

if isinstance(command, str):

command = subst.Substitute(command)

« no previous file with comments | « no previous file | toolchain_build/toolchain_build_pnacl.py » ('j') | toolchain_build/toolchain_build_pnacl.py » ('J')