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

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

Issue 506863005: [NaCl SDK] getos.py now checks against the Cr-Commit-Position. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@sbc-nacl-sdk-fix-getos-tests
Patch Set: Indentation. 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 unified diff | Download patch
« no previous file with comments | « no previous file | native_client_sdk/src/tools/getos.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 186 matching lines...) Expand 10 before | Expand all | Expand 10 after
197 197
198 198
199 # 199 #
200 # Compute path to requested NaCl Toolchain 200 # Compute path to requested NaCl Toolchain
201 # 201 #
202 TC_PATH := $(abspath $(NACL_SDK_ROOT)/toolchain) 202 TC_PATH := $(abspath $(NACL_SDK_ROOT)/toolchain)
203 203
204 204
205 # 205 #
206 # Check for required minimum SDK version. 206 # Check for required minimum SDK version.
207 # A makefile can declare NACL_SDK_VERSION_MIN of the form "<major>.<position>",
208 # where <major> is the major Chromium version number, and <position> is the
209 # Chromium Cr-Commit-Position number. eg. "39.295386".
207 # 210 #
208 ifdef NACL_SDK_VERSION_MIN 211 ifdef NACL_SDK_VERSION_MIN
209 VERSION_CHECK:=$(shell $(GETOS) --check-version=$(NACL_SDK_VERSION_MIN) 2>&1) 212 VERSION_CHECK:=$(shell $(GETOS) --check-version=$(NACL_SDK_VERSION_MIN) 2>&1)
210 ifneq ($(VERSION_CHECK),) 213 ifneq ($(VERSION_CHECK),)
211 $(error $(VERSION_CHECK)) 214 $(error $(VERSION_CHECK))
212 endif 215 endif
213 endif 216 endif
214 217
215 218
216 # 219 #
(...skipping 312 matching lines...) Expand 10 before | Expand all | Expand 10 after
529 # uppercase aliases (for backward compatibility) 532 # uppercase aliases (for backward compatibility)
530 .PHONY: CHECK_FOR_CHROME DEBUG LAUNCH RUN 533 .PHONY: CHECK_FOR_CHROME DEBUG LAUNCH RUN
531 CHECK_FOR_CHROME: check_for_chrome 534 CHECK_FOR_CHROME: check_for_chrome
532 DEBUG: debug 535 DEBUG: debug
533 LAUNCH: run 536 LAUNCH: run
534 RUN: run 537 RUN: run
535 538
536 endif # TOOLCHAIN is valid... 539 endif # TOOLCHAIN is valid...
537 540
538 endif # TOOLCHAIN=all 541 endif # TOOLCHAIN=all
OLDNEW
« no previous file with comments | « no previous file | native_client_sdk/src/tools/getos.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698