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

Side by Side Diff: tools/lto/Makefile

Issue 939073008: Rebased PNaCl localmods in LLVM to 223109 (Closed)
Patch Set: undo localmod Created 5 years, 9 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 | « tools/llvm-nm/llvm-nm.cpp ('k') | tools/opt/CMakeLists.txt » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 ##===- tools/lto/Makefile ----------------------------------*- Makefile -*-===## 1 ##===- tools/lto/Makefile ----------------------------------*- Makefile -*-===##
2 # 2 #
3 # The LLVM Compiler Infrastructure 3 # The LLVM Compiler Infrastructure
4 # 4 #
5 # This file is distributed under the University of Illinois Open Source 5 # This file is distributed under the University of Illinois Open Source
6 # License. See LICENSE.TXT for details. 6 # License. See LICENSE.TXT for details.
7 # 7 #
8 ##===----------------------------------------------------------------------===## 8 ##===----------------------------------------------------------------------===##
9 9
10 LEVEL := ../.. 10 LEVEL := ../..
(...skipping 22 matching lines...) Expand all
33 -Wl,-compatibility_version -Wl,1 33 -Wl,-compatibility_version -Wl,1
34 endif 34 endif
35 35
36 # If we're doing an Apple-style build, add the LTO object path. 36 # If we're doing an Apple-style build, add the LTO object path.
37 ifeq ($(RC_XBS),YES) 37 ifeq ($(RC_XBS),YES)
38 TempFile := $(shell mkdir -p ${OBJROOT}/dSYMs ; mktemp ${OBJROOT}/ dSYMs/llvm-lto.XXXXXX) 38 TempFile := $(shell mkdir -p ${OBJROOT}/dSYMs ; mktemp ${OBJROOT}/ dSYMs/llvm-lto.XXXXXX)
39 LLVMLibsOptions := $(LLVMLibsOptions) \ 39 LLVMLibsOptions := $(LLVMLibsOptions) \
40 -Wl,-object_path_lto -Wl,$(TempFile) 40 -Wl,-object_path_lto -Wl,$(TempFile)
41 endif 41 endif
42 endif 42 endif
43
44 #@ LOCALMOD-BEGIN
45 # This is to fix an upstream bug. It is in the process of being upstreamed.
46 # This line can be removed after it has been fixed upstream and we've merged.
47 ifneq ($(HOST_OS),Darwin)
48 LLVMLibsOptions := $(LLVMLibsOptions) -Wl,-soname=$(SharedPrefix)LTO$(SHLIBEXT )
49 endif
50 #@ LOCALMOD-END
OLDNEW
« no previous file with comments | « tools/llvm-nm/llvm-nm.cpp ('k') | tools/opt/CMakeLists.txt » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698