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

Side by Side Diff: Makefile.standalone

Issue 1211593003: Remove unnecessary TEXTBC_LIBS makefile definition. (Closed) Base URL: https://chromium.googlesource.com/native_client/pnacl-subzero.git@master
Patch Set: Created 5 years, 6 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> LIBCXX_INSTALL_PATH=<path> CLANG_PATH=<path> \ 5 # make LLVM_SRC_PATH=<path> LIBCXX_INSTALL_PATH=<path> CLANG_PATH=<path> \
6 # PNACL_BIN_PATH=<path> ... 6 # PNACL_BIN_PATH=<path> ...
7 # 7 #
8 8
9 # LLVM_SRC_PATH is the path to the root of the checked out source code. This 9 # LLVM_SRC_PATH is the path to the root of the checked out source code. This
10 # directory should contain the configure script, the include/ and lib/ 10 # directory should contain the configure script, the include/ and lib/
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
82 -DALLOW_MINIMAL_BUILD=1 82 -DALLOW_MINIMAL_BUILD=1
83 else 83 else
84 BASE_CXX_DEFINES += -DALLOW_DUMP=1 -DALLOW_LLVM_CL=1 -DALLOW_LLVM_IR=1 \ 84 BASE_CXX_DEFINES += -DALLOW_DUMP=1 -DALLOW_LLVM_CL=1 -DALLOW_LLVM_IR=1 \
85 -DALLOW_LLVM_IR_AS_INPUT=1 -DALLOW_DISABLE_IR_GEN=1 \ 85 -DALLOW_LLVM_IR_AS_INPUT=1 -DALLOW_DISABLE_IR_GEN=1 \
86 -DALLOW_MINIMAL_BUILD=0 86 -DALLOW_MINIMAL_BUILD=0
87 endif 87 endif
88 88
89 ifdef TEXTUAL_BITCODE 89 ifdef TEXTUAL_BITCODE
90 BASE_CXX_DEFINES += -DINPUT_IS_TEXTUAL_BITCODE=1 90 BASE_CXX_DEFINES += -DINPUT_IS_TEXTUAL_BITCODE=1
91 OBJDIR := $(OBJDIR)+Tbc 91 OBJDIR := $(OBJDIR)+Tbc
92 TEXTBC_LIBS = -LLVMNaClBitTestUtils
93 else 92 else
94 BASE_CXX_DEFINES += -DINPUT_IS_TEXTUAL_BITCODE=0 93 BASE_CXX_DEFINES += -DINPUT_IS_TEXTUAL_BITCODE=0
95 TEXTBC_LIBS =
96 endif 94 endif
97 95
98 SB_CXX_DEFINES := $(BASE_CXX_DEFINES) -DPNACL_BROWSER_TRANSLATOR=1 96 SB_CXX_DEFINES := $(BASE_CXX_DEFINES) -DPNACL_BROWSER_TRANSLATOR=1
99 CXX_DEFINES := $(BASE_CXX_DEFINES) -DPNACL_BROWSER_TRANSLATOR=0 97 CXX_DEFINES := $(BASE_CXX_DEFINES) -DPNACL_BROWSER_TRANSLATOR=0
100 98
101 ifdef NOASSERT 99 ifdef NOASSERT
102 ASSERTIONS = -DNDEBUG 100 ASSERTIONS = -DNDEBUG
103 else 101 else
104 ASSERTIONS = 102 ASSERTIONS =
105 OBJDIR := $(OBJDIR)+Asserts 103 OBJDIR := $(OBJDIR)+Asserts
(...skipping 26 matching lines...) Expand all
132 # and the unittests, since we build "tools-only" for the 130 # and the unittests, since we build "tools-only" for the
133 # sandboxed_translators (which doesn't include every library 131 # sandboxed_translators (which doesn't include every library
134 # listed by llvm-config). 132 # listed by llvm-config).
135 133
136 LLVM_LIBS_LIST := -lLLVMIRReader -lLLVMBitReader -lLLVMNaClBitTestUtils \ 134 LLVM_LIBS_LIST := -lLLVMIRReader -lLLVMBitReader -lLLVMNaClBitTestUtils \
137 -lLLVMNaClBitReader -lLLVMNaClBitAnalysis -lLLVMNaClBitWriter \ 135 -lLLVMNaClBitReader -lLLVMNaClBitAnalysis -lLLVMNaClBitWriter \
138 -lLLVMAsmParser -lLLVMNaClAnalysis -lLLVMCore -lLLVMSupport 136 -lLLVMAsmParser -lLLVMNaClAnalysis -lLLVMCore -lLLVMSupport
139 137
140 ifeq ($(AUTOCONF), 0) 138 ifeq ($(AUTOCONF), 0)
141 # LLVM cmake build 139 # LLVM cmake build
142 LLVM_LIBS := $(LLVM_LIBS_LIST) $(TEXTBC_LIBS) 140 LLVM_LIBS := $(LLVM_LIBS_LIST)
143 # For the cmake build, the gtest libs end up in the same place as the LLVM 141 # For the cmake build, the gtest libs end up in the same place as the LLVM
144 # libs, so no "-L..." arg is needed. 142 # libs, so no "-L..." arg is needed.
145 GTEST_LIB_PATH ?= 143 GTEST_LIB_PATH ?=
146 CLANG_FORMAT_PATH ?= $(PNACL_BIN_PATH) 144 CLANG_FORMAT_PATH ?= $(PNACL_BIN_PATH)
147 else 145 else
148 # LLVM autoconf build 146 # LLVM autoconf build
149 LLVM_LIBS := -lLLVM-3.7svn 147 LLVM_LIBS := -lLLVM-3.7svn
150 GTEST_LIB_PATH ?= -L../../out/llvm_x86_64_linux_work/Release+Asserts/lib 148 GTEST_LIB_PATH ?= -L../../out/llvm_x86_64_linux_work/Release+Asserts/lib
151 CLANG_FORMAT_PATH ?= ../../out/llvm_x86_64_linux_work/Release+Asserts/bin 149 CLANG_FORMAT_PATH ?= ../../out/llvm_x86_64_linux_work/Release+Asserts/bin
152 endif 150 endif
(...skipping 203 matching lines...) Expand 10 before | Expand all | Expand 10 after
356 bloat: make_symlink 354 bloat: make_symlink
357 nm -C -S -l pnacl-sz | \ 355 nm -C -S -l pnacl-sz | \
358 bloat/bloat.py --nm-output=/dev/stdin syms > build/pnacl-sz.bloat.json 356 bloat/bloat.py --nm-output=/dev/stdin syms > build/pnacl-sz.bloat.json
359 @echo See Subzero size breakdown in bloat/pnacl-sz.bloat.html 357 @echo See Subzero size breakdown in bloat/pnacl-sz.bloat.html
360 358
361 clean: 359 clean:
362 rm -rf pnacl-sz *.o $(OBJDIR) $(SB_OBJDIR) build/pnacl-sz.bloat.json 360 rm -rf pnacl-sz *.o $(OBJDIR) $(SB_OBJDIR) build/pnacl-sz.bloat.json
363 361
364 clean-all: clean 362 clean-all: clean
365 rm -rf build/ 363 rm -rf 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