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

Side by Side Diff: Makefile

Issue 1205463002: Fix llvm makefile to handle macro INPUT_IS_TEXTUAL_BITCODE. (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 1
2 ifndef SUBZERO_LEVEL 2 ifndef SUBZERO_LEVEL
3 # Top-level, not included from a subdir 3 # Top-level, not included from a subdir
4 SUBZERO_LEVEL := . 4 SUBZERO_LEVEL := .
5 DIRS := src 5 DIRS := src
6 PARALLEL_DIRS := 6 PARALLEL_DIRS :=
7 endif 7 endif
8 8
9 # Set LLVM source root level. 9 # Set LLVM source root level.
10 LEVEL := $(SUBZERO_LEVEL)/../.. 10 LEVEL := $(SUBZERO_LEVEL)/../..
11 11
12 # Include LLVM common makefile. 12 # Include LLVM common makefile.
13 include $(LEVEL)/Makefile.common 13 include $(LEVEL)/Makefile.common
14 14
15 # -O3 seems to trigger the following PNaCl ABI transform bug 15 # -O3 seems to trigger the following PNaCl ABI transform bug
16 # on method pointers, so override that with -O2: 16 # on method pointers, so override that with -O2:
17 # https://code.google.com/p/nativeclient/issues/detail?id=3857 17 # https://code.google.com/p/nativeclient/issues/detail?id=3857
18 CXX.Flags += -O2 18 CXX.Flags += -O2
19 # Newlib paired with libc++ requires gnu. 19 # Newlib paired with libc++ requires gnu.
20 CXX.Flags += -std=gnu++11 20 CXX.Flags += -std=gnu++11
21 21
22 ifeq ($(PNACL_BROWSER_TRANSLATOR),1) 22 ifeq ($(PNACL_BROWSER_TRANSLATOR),1)
23 CPP.Defines += -DALLOW_DUMP=0 -DALLOW_LLVM_CL=0 -DALLOW_LLVM_IR=0 \ 23 CPP.Defines += -DALLOW_DUMP=0 -DALLOW_LLVM_CL=0 -DALLOW_LLVM_IR=0 \
24 -DALLOW_LLVM_IR_AS_INPUT=0 -DALLOW_DISABLE_IR_GEN=0 \ 24 -DALLOW_LLVM_IR_AS_INPUT=0 -DALLOW_DISABLE_IR_GEN=0 \
25 -DALLOW_MINIMAL_BUILD=1 -DPNACL_BROWSER_TRANSLATOR=1 25 -DALLOW_MINIMAL_BUILD=1 -DPNACL_BROWSER_TRANSLATOR=1 \
26 -DINPUT_IS_TEXTUAL_BITCODE=0
26 else 27 else
27 CPP.Defines += -DALLOW_DUMP=1 -DALLOW_LLVM_CL=1 -DALLOW_LLVM_IR=1 \ 28 CPP.Defines += -DALLOW_DUMP=1 -DALLOW_LLVM_CL=1 -DALLOW_LLVM_IR=1 \
28 -DALLOW_LLVM_IR_AS_INPUT=1 -DALLOW_DISABLE_IR_GEN=1 \ 29 -DALLOW_LLVM_IR_AS_INPUT=1 -DALLOW_DISABLE_IR_GEN=1 \
29 -DALLOW_MINIMAL_BUILD=0 -DPNACL_BROWSER_TRANSLATOR=0 30 -DALLOW_MINIMAL_BUILD=0 -DPNACL_BROWSER_TRANSLATOR=0 \
31 -DINPUT_IS_TEXTUAL_BITCODE=0
30 endif 32 endif
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