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

Side by Side Diff: native_client_sdk/src/tools/common.mk

Issue 12220085: [NaCl SDK] Print nice error if host build can't find gcc or cl.exe (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 10 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | native_client_sdk/src/tools/oshelpers.py » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 # 5 #
6 # GNU Make based build file. For details on GNU Make see: 6 # GNU Make based build file. For details on GNU Make see:
7 # http://www.gnu.org/software/make/manual/make.html 7 # http://www.gnu.org/software/make/manual/make.html
8 # 8 #
9 # 9 #
10 10
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
62 export CYGWIN 62 export CYGWIN
63 63
64 64
65 # 65 #
66 # Alias for standard POSIX file system commands 66 # Alias for standard POSIX file system commands
67 # 67 #
68 CP:=python $(NACL_SDK_ROOT)/tools/oshelpers.py cp 68 CP:=python $(NACL_SDK_ROOT)/tools/oshelpers.py cp
69 MKDIR:=python $(NACL_SDK_ROOT)/tools/oshelpers.py mkdir 69 MKDIR:=python $(NACL_SDK_ROOT)/tools/oshelpers.py mkdir
70 MV:=python $(NACL_SDK_ROOT)/tools/oshelpers.py mv 70 MV:=python $(NACL_SDK_ROOT)/tools/oshelpers.py mv
71 RM:=python $(NACL_SDK_ROOT)/tools/oshelpers.py rm 71 RM:=python $(NACL_SDK_ROOT)/tools/oshelpers.py rm
72 WHICH:=python $(NACL_SDK_ROOT)/tools/oshelpers.py which
72 73
73 74
74 # 75 #
75 # Compute path to requested NaCl Toolchain 76 # Compute path to requested NaCl Toolchain
76 # 77 #
77 OSNAME:=$(shell python $(NACL_SDK_ROOT)/tools/getos.py) 78 OSNAME:=$(shell python $(NACL_SDK_ROOT)/tools/getos.py)
78 TC_PATH:=$(abspath $(NACL_SDK_ROOT)/toolchain) 79 TC_PATH:=$(abspath $(NACL_SDK_ROOT)/toolchain)
79 80
80 81
81 82
(...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after
189 # 190 #
190 # If the requested toolchain is a NaCl or PNaCl toolchain, the use the 191 # If the requested toolchain is a NaCl or PNaCl toolchain, the use the
191 # macros and targets defined in nacl.mk, otherwise use the host sepecific 192 # macros and targets defined in nacl.mk, otherwise use the host sepecific
192 # macros and targets. 193 # macros and targets.
193 # 194 #
194 ifneq (,$(findstring $(TOOLCHAIN),linux mac)) 195 ifneq (,$(findstring $(TOOLCHAIN),linux mac))
195 include $(NACL_SDK_ROOT)/tools/host_gcc.mk 196 include $(NACL_SDK_ROOT)/tools/host_gcc.mk
196 endif 197 endif
197 198
198 ifneq (,$(findstring $(TOOLCHAIN),win)) 199 ifneq (,$(findstring $(TOOLCHAIN),win))
200 ifneq (,$(findstring $(shell $(WHICH) cl.exe),cl.exe))
noelallen1 2013/02/08 23:50:06 nit: I would have put the WIN specific stuff in h
199 include $(NACL_SDK_ROOT)/tools/host_vc.mk 201 include $(NACL_SDK_ROOT)/tools/host_vc.mk
202 else
203 $(warning cl.exe not found in PATH. Skipping host build.)
204 endif
200 endif 205 endif
201 206
202 ifneq (,$(findstring $(TOOLCHAIN),glibc newlib)) 207 ifneq (,$(findstring $(TOOLCHAIN),glibc newlib))
203 include $(NACL_SDK_ROOT)/tools/nacl_gcc.mk 208 include $(NACL_SDK_ROOT)/tools/nacl_gcc.mk
204 endif 209 endif
205 210
206 ifneq (,$(findstring $(TOOLCHAIN),pnacl)) 211 ifneq (,$(findstring $(TOOLCHAIN),pnacl))
207 include $(NACL_SDK_ROOT)/tools/nacl_llvm.mk 212 include $(NACL_SDK_ROOT)/tools/nacl_llvm.mk
208 endif 213 endif
209 214
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
256 261
257 SYSARCH=$(shell python $(NACL_SDK_ROOT)/tools/getos.py --chrome) 262 SYSARCH=$(shell python $(NACL_SDK_ROOT)/tools/getos.py --chrome)
258 GDB_ARGS+=-D $(TC_PATH)/$(OSNAME)_x86_$(TOOLCHAIN)/bin/$(SYSARCH)-nacl-gdb 263 GDB_ARGS+=-D $(TC_PATH)/$(OSNAME)_x86_$(TOOLCHAIN)/bin/$(SYSARCH)-nacl-gdb
259 GDB_ARGS+=-D $(CURDIR)/$(OUTDIR)/$(TARGET)_$(SYSARCH).nexe 264 GDB_ARGS+=-D $(CURDIR)/$(OUTDIR)/$(TARGET)_$(SYSARCH).nexe
260 265
261 DEBUG: CHECK_FOR_CHROME all 266 DEBUG: CHECK_FOR_CHROME all
262 $(RUN_PY) $(GDB_ARGS) \ 267 $(RUN_PY) $(GDB_ARGS) \
263 -C $(CURDIR) -P $(PAGE) $(addprefix -E ,$(CHROME_ENV)) -- \ 268 -C $(CURDIR) -P $(PAGE) $(addprefix -E ,$(CHROME_ENV)) -- \
264 $(CHROME_PATH) $(CHROME_ARGS) --enable-nacl-debug \ 269 $(CHROME_PATH) $(CHROME_ARGS) --enable-nacl-debug \
265 --register-pepper-plugins="$(PPAPI_DEBUG),$(PPAPI_RELEASE)" 270 --register-pepper-plugins="$(PPAPI_DEBUG),$(PPAPI_RELEASE)"
OLDNEW
« no previous file with comments | « no previous file | native_client_sdk/src/tools/oshelpers.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698