Makefile.standalone - Issue 689433002: Remove IceConverter when LLVM IR is not allowed.

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 689433002: Remove IceConverter when LLVM IR is not allowed. (Closed) Base URL: https://chromium.googlesource.com/native_client/pnacl-subzero.git@master

Patch Set: Remove using conditional preprocessor directives. Created 6 years, 2 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 feae52cd913dac7faf576f71353714c66e9410e7..291b442818b622dfaacf8f3829645ac205e5d90e 100644

--- a/Makefile.standalone

+++ b/Makefile.standalone

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

-I$(LIBCXX_INSTALL_PATH)/include/c++/v1

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

-SRCS= \

+SRCS = \

assembler.cpp \

assembler_ia32.cpp \

IceCfg.cpp \

IceCfgNode.cpp \

- IceConverter.cpp \

IceGlobalContext.cpp \

IceGlobalInits.cpp \

IceInst.cpp \

@@ -111,6 +110,10 @@ SRCS= \

llvm2ice.cpp \

PNaClTranslator.cpp

+ifndef MINIMAL

+ SRCS += IceConverter.cpp

+endif

OBJS=$(patsubst %.cpp, $(OBJDIR)/%.o, $(SRCS))

# Keep all the first target so it's the default.

@@ -143,8 +146,13 @@ check-lit: llvm2ice make_symlink

LLVM_BIN_PATH=$(LLVM_BIN_PATH) \

$(LLVM_SRC_PATH)/utils/lit/lit.py -sv tests_lit

+ifdef MINIMAL

+check: check-lit

+ @echo "Crosstests ignored, minimal build"

+else

check: check-lit

(cd crosstest; ./runtests.sh)

+endif

# TODO: Fix the use of wildcards.

# Assumes clang-format is within $PATH.

« no previous file with comments | « no previous file | pydir/crosstest.py » ('j') | src/llvm2ice.cpp » ('J')