Makefile.standalone - Issue 756543002: Subzero: Fix new issues after the LLVM 3.5 merge.

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 756543002: Subzero: Fix new issues after the LLVM 3.5 merge. (Closed) Base URL: https://chromium.googlesource.com/native_client/pnacl-subzero.git@master

Patch Set: Also use `llvm-config --system-libs` 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 side-by-side diff with in-line comments

Download patch

Index: Makefile.standalone

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

index b6e7eb6a894e93aa848c84be12aff12654e79e8b..d6a2dafaa796c9fe0d22d4c0062c47dbd0b08f8c 100644

--- a/Makefile.standalone

+++ b/Makefile.standalone

@@ -74,7 +74,8 @@ $(info -----------------------------------------------)

LLVM_CXXFLAGS := `$(LLVM_BIN_PATH)/llvm-config --cxxflags`

LLVM_LDFLAGS := `$(LLVM_BIN_PATH)/llvm-config --libs` \

- `$(LLVM_BIN_PATH)/llvm-config --ldflags`

+ `$(LLVM_BIN_PATH)/llvm-config --ldflags` \

+ `$(LLVM_BIN_PATH)/llvm-config --system-libs`

# It's recommended that CXX matches the compiler you used to build LLVM itself.

CCACHE := `command -v ccache`

@@ -133,7 +134,7 @@ make_symlink: $(OBJDIR)/llvm2ice

# TODO(kschimpf): Fix python scripts to directly get build attributes

# rather than generating $(OBJDIR)/llvm2ice.build_atts.

$(OBJDIR)/llvm2ice: $(OBJS)

- $(CXX) $(LDFLAGS) -o $@ $^ $(LLVM_LDFLAGS) -ldl \

+ $(CXX) $(LDFLAGS) -o $@ $^ $(LLVM_LDFLAGS) \

-Wl,-rpath=$(abspath $(LIBCXX_INSTALL_PATH)/lib)

# TODO: Be more precise than "*.h" here and elsewhere.

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