Makefile - Issue 659513005: Allow conditional lit tests in Subzero, based on build flags.

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

Issue 659513005: Allow conditional lit tests in Subzero, based on build flags. (Closed) Base URL: https://chromium.googlesource.com/native_client/pnacl-subzero.git@master

Patch Set: Fix LLVM (i.e. trybot) builds to handle subzero. Created 6 years, 1 month 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

OLD	NEW
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

	15 CXX.Flags += -std=c++11 -Wextra -Werror
	Jim Stichnoth 2014/10/27 21:33:09 We shouldn't need -std=c++11 after the LLVM 3.5 me We shouldn't need -std=c++11 after the LLVM 3.5 merge, so either remove it or add a TODO to remove it, depending on whether you land this before or after the merge. And to be safe, maybe add -Wno-error=unused-parameter ? Karl 2014/10/27 21:42:28 Done. Show quoted text On 2014/10/27 21:33:09, stichnot wrote: > We shouldn't need -std=c++11 after the LLVM 3.5 merge, so either remove it or > add a TODO to remove it, depending on whether you land this before or after the > merge. > > And to be safe, maybe add -Wno-error=unused-parameter ? Done.
	16 CPP.Defines += -DALLOW_TEXT_ASM=1 -DALLOW_DUMP=1 -DALLOW_LLVM_CL=1 \

	17 -DALLOW_LLVM_IR=1 -DALLOW_LLVM_IR_AS_INPUT=1

	18

OLD	NEW

« no previous file with comments | « no previous file | Makefile.standalone » ('j') | no next file with comments »