Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(581)

Side by Side Diff: Makefile.standalone

Issue 514723004: Subzero: Fix the link command for Trusty. (Closed) Base URL: https://gerrit.chromium.org/gerrit/p/native_client/pnacl-subzero.git@master
Patch Set: Created 6 years, 3 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 | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 16 matching lines...) Expand all
27 endif 27 endif
28 endif 28 endif
29 29
30 $(info -----------------------------------------------) 30 $(info -----------------------------------------------)
31 $(info Using LLVM_SRC_PATH = $(LLVM_SRC_PATH)) 31 $(info Using LLVM_SRC_PATH = $(LLVM_SRC_PATH))
32 $(info Using LLVM_BIN_PATH = $(LLVM_BIN_PATH)) 32 $(info Using LLVM_BIN_PATH = $(LLVM_BIN_PATH))
33 $(info Using HOST_ARCH = $(HOST_ARCH)) 33 $(info Using HOST_ARCH = $(HOST_ARCH))
34 $(info -----------------------------------------------) 34 $(info -----------------------------------------------)
35 35
36 LLVM_CXXFLAGS := `$(LLVM_BIN_PATH)/llvm-config --cxxflags` 36 LLVM_CXXFLAGS := `$(LLVM_BIN_PATH)/llvm-config --cxxflags`
37 LLVM_LDFLAGS := `$(LLVM_BIN_PATH)/llvm-config --ldflags --libs` 37 LLVM_LDFLAGS := `$(LLVM_BIN_PATH)/llvm-config --libs` \
38 `$(LLVM_BIN_PATH)/llvm-config --ldflags`
jvoung (off chromium) 2014/08/27 17:55:19 Just heads up -- I think in llvm 3.5 or 3.6 this g
38 39
39 # It's recommended that CXX matches the compiler you used to build LLVM itself. 40 # It's recommended that CXX matches the compiler you used to build LLVM itself.
40 OPTLEVEL := -O0 41 OPTLEVEL := -O0
41 CXX := g++ 42 CXX := g++
42 43
43 CXXFLAGS := -Wall -Wextra -Werror -fno-rtti -fno-exceptions \ 44 CXXFLAGS := -Wall -Wextra -Werror -fno-rtti -fno-exceptions \
44 $(OPTLEVEL) -g $(LLVM_CXXFLAGS) $(HOST_FLAGS) \ 45 $(OPTLEVEL) -g $(LLVM_CXXFLAGS) $(HOST_FLAGS) \
45 -Wno-error=unused-parameter 46 -Wno-error=unused-parameter
46 LDFLAGS := $(HOST_FLAGS) 47 LDFLAGS := $(HOST_FLAGS)
47 48
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
104 CLANG_FORMAT_DIFF = clang-format-diff.py 105 CLANG_FORMAT_DIFF = clang-format-diff.py
105 else 106 else
106 CLANG_FORMAT_DIFF = /usr/lib/clang-format/clang-format-diff.py 107 CLANG_FORMAT_DIFF = /usr/lib/clang-format/clang-format-diff.py
107 endif 108 endif
108 format-diff: 109 format-diff:
109 git diff -U0 `git merge-base HEAD master` | \ 110 git diff -U0 `git merge-base HEAD master` | \
110 $(CLANG_FORMAT_DIFF) -p1 -style=LLVM -i 111 $(CLANG_FORMAT_DIFF) -p1 -style=LLVM -i
111 112
112 clean: 113 clean:
113 rm -rf llvm2ice *.o build/ 114 rm -rf llvm2ice *.o build/
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698