Makefile.standalone - Issue 623493002: Subzero: Allow builds with assertions disabled.

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

Unified Diff: Makefile.standalone

Issue 623493002: Subzero: Allow builds with assertions disabled. (Closed) Base URL: https://chromium.googlesource.com/native_client/pnacl-subzero.git@master

Patch Set: Remove commented-out include 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 side-by-side diff with in-line comments

Download patch

Index: Makefile.standalone

diff --git a/Makefile.standalone b/Makefile.standalone

index 175dd124ab9992acee6ace4730c6f1cf02c87e53..ae39305f9ae164aa9af4aca330c236a78d44411b 100644

--- a/Makefile.standalone

+++ b/Makefile.standalone

@@ -45,6 +45,13 @@ else

OPTLEVEL = -O2

endif

+ifdef NOASSERT

+ ASSERTIONS = -DNDEBUG

+else

+ ASSERTIONS =

+ OBJDIR := $(OBJDIR)+Asserts

+endif

$(info -----------------------------------------------)

$(info Using LLVM_SRC_PATH = $(LLVM_SRC_PATH))

$(info Using LLVM_BIN_PATH = $(LLVM_BIN_PATH))

@@ -62,7 +69,7 @@ CCACHE := `command -v ccache`

CXX := CCACHE_CPP2=yes $(CCACHE) $(CLANG_PATH)/clang++

CXXFLAGS := $(LLVM_CXXFLAGS) -std=c++11 -Wall -Wextra -Werror -fno-rtti \

- -fno-exceptions $(OPTLEVEL) -g $(HOST_FLAGS) \

+ -fno-exceptions $(OPTLEVEL) $(ASSERTIONS) -g $(HOST_FLAGS) \

-Wno-error=unused-parameter -I$(LIBCXX_INSTALL_PATH)/include/c++/v1

LDFLAGS := $(HOST_FLAGS) -L$(LIBCXX_INSTALL_PATH)/lib

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