Makefile.standalone - Issue 449093002: Subzero: A few fixes toward running larger programs.

Side by Side Diff

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

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

Side by Side Diff: Makefile.standalone

Issue 449093002: Subzero: A few fixes toward running larger programs. (Closed) Base URL: https://gerrit.chromium.org/gerrit/p/native_client/pnacl-subzero.git@master

Patch Set: Fix "make format-diff", and run it Created 6 years, 4 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 unified diff | Download patch

« no previous file with comments | « no previous file | src/IceClFlags.h » ('j') | no next file with comments »

OLD	NEW
1 # The following variables will likely need to be modified, depending on where	1 # The following variables will likely need to be modified, depending on where

2 # and how you built LLVM & Clang. They can be overridden in a command-line	2 # and how you built LLVM & Clang. They can be overridden in a command-line

3 # invocation of make, like:	3 # invocation of make, like:

4 #	4 #

5 # make LLVM_SRC_PATH=<path> LLVM_BIN_PATH=<path> ...	5 # make LLVM_SRC_PATH=<path> LLVM_BIN_PATH=<path> ...

6 #	6 #

7	7

8 # LLVM_SRC_PATH is the path to the root of the checked out source code. This	8 # LLVM_SRC_PATH is the path to the root of the checked out source code. This

9 # directory should contain the configure script, the include/ and lib/	9 # directory should contain the configure script, the include/ and lib/

10 # directories of LLVM, Clang in tools/clang/, etc.	10 # directories of LLVM, Clang in tools/clang/, etc.

(...skipping 85 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
96 # clang-format it calls is also within $PATH. This may require adding	96 # clang-format it calls is also within $PATH. This may require adding

97 # a component to $PATH, or creating symlinks within some existing	97 # a component to $PATH, or creating symlinks within some existing

98 # $PATH component. Uses the one in /usr/lib/clang-format/ if it	98 # $PATH component. Uses the one in /usr/lib/clang-format/ if it

99 # exists.	99 # exists.

100 ifeq (,$(wildcard /usr/lib/clang-format/clang-format-diff.py))	100 ifeq (,$(wildcard /usr/lib/clang-format/clang-format-diff.py))

101 CLANG_FORMAT_DIFF = clang-format-diff.py	101 CLANG_FORMAT_DIFF = clang-format-diff.py

102 else	102 else

103 CLANG_FORMAT_DIFF = /usr/lib/clang-format/clang-format-diff.py	103 CLANG_FORMAT_DIFF = /usr/lib/clang-format/clang-format-diff.py

104 endif	104 endif

105 format-diff:	105 format-diff:

106 » git diff -U0 HEAD^ \| \	106 » git diff -U0 `git merge-base HEAD master` \| \

107 $(CLANG_FORMAT_DIFF) -p1 -style=LLVM -i	107 $(CLANG_FORMAT_DIFF) -p1 -style=LLVM -i

108	108

109 clean:	109 clean:

110 rm -rf llvm2ice *.o build/	110 rm -rf llvm2ice *.o build/

OLD	NEW