| OLD | NEW |
| 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 # |
| 11 # Toolchain | 11 # Toolchain |
| 12 # | 12 # |
| 13 # By default the VALID_TOOLCHAINS list contains pnacl, newlib and glibc. If | 13 # By default the VALID_TOOLCHAINS list contains pnacl, newlib and glibc. If |
| 14 # your project only builds in one or the other then this should be overridden | 14 # your project only builds in one or the other then this should be overridden |
| 15 # accordingly. | 15 # accordingly. |
| 16 # | 16 # |
| 17 ifneq ($(ENABLE_BIONIC),) | 17 ifneq ($(ENABLE_BIONIC),) |
| 18 ALL_TOOLCHAINS ?= pnacl newlib glibc bionic | 18 ALL_TOOLCHAINS ?= pnacl newlib glibc clang-newlib bionic |
| 19 else | 19 else |
| 20 ALL_TOOLCHAINS ?= pnacl newlib glibc | 20 ALL_TOOLCHAINS ?= pnacl newlib glibc clang-newlib |
| 21 endif | 21 endif |
| 22 | 22 |
| 23 VALID_TOOLCHAINS ?= $(ALL_TOOLCHAINS) | 23 VALID_TOOLCHAINS ?= $(ALL_TOOLCHAINS) |
| 24 TOOLCHAIN ?= $(word 1,$(VALID_TOOLCHAINS)) | 24 TOOLCHAIN ?= $(word 1,$(VALID_TOOLCHAINS)) |
| 25 | 25 |
| 26 # | 26 # |
| 27 # Top Make file, which we want to trigger a rebuild on if it changes | 27 # Top Make file, which we want to trigger a rebuild on if it changes |
| 28 # | 28 # |
| 29 TOP_MAKE := $(word 1,$(MAKEFILE_LIST)) | 29 TOP_MAKE := $(word 1,$(MAKEFILE_LIST)) |
| 30 | 30 |
| (...skipping 380 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 411 # macros and targets. | 411 # macros and targets. |
| 412 # | 412 # |
| 413 ifneq (,$(findstring $(TOOLCHAIN),linux mac)) | 413 ifneq (,$(findstring $(TOOLCHAIN),linux mac)) |
| 414 include $(NACL_SDK_ROOT)/tools/host_gcc.mk | 414 include $(NACL_SDK_ROOT)/tools/host_gcc.mk |
| 415 endif | 415 endif |
| 416 | 416 |
| 417 ifneq (,$(findstring $(TOOLCHAIN),win)) | 417 ifneq (,$(findstring $(TOOLCHAIN),win)) |
| 418 include $(NACL_SDK_ROOT)/tools/host_vc.mk | 418 include $(NACL_SDK_ROOT)/tools/host_vc.mk |
| 419 endif | 419 endif |
| 420 | 420 |
| 421 ifneq (,$(findstring $(TOOLCHAIN),glibc newlib bionic)) | 421 ifneq (,$(findstring $(TOOLCHAIN),glibc newlib bionic clang-newlib)) |
| 422 include $(NACL_SDK_ROOT)/tools/nacl_gcc.mk | 422 include $(NACL_SDK_ROOT)/tools/nacl_gcc.mk |
| 423 endif | 423 endif |
| 424 | 424 |
| 425 ifneq (,$(findstring $(TOOLCHAIN),pnacl)) | 425 ifneq (,$(findstring $(TOOLCHAIN),pnacl)) |
| 426 include $(NACL_SDK_ROOT)/tools/nacl_llvm.mk | 426 include $(NACL_SDK_ROOT)/tools/nacl_llvm.mk |
| 427 endif | 427 endif |
| 428 | 428 |
| 429 # | 429 # |
| 430 # File to redirect to to in order to hide output. | 430 # File to redirect to to in order to hide output. |
| 431 # | 431 # |
| (...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 536 # uppercase aliases (for backward compatibility) | 536 # uppercase aliases (for backward compatibility) |
| 537 .PHONY: CHECK_FOR_CHROME DEBUG LAUNCH RUN | 537 .PHONY: CHECK_FOR_CHROME DEBUG LAUNCH RUN |
| 538 CHECK_FOR_CHROME: check_for_chrome | 538 CHECK_FOR_CHROME: check_for_chrome |
| 539 DEBUG: debug | 539 DEBUG: debug |
| 540 LAUNCH: run | 540 LAUNCH: run |
| 541 RUN: run | 541 RUN: run |
| 542 | 542 |
| 543 endif # TOOLCHAIN is valid... | 543 endif # TOOLCHAIN is valid... |
| 544 | 544 |
| 545 endif # TOOLCHAIN=all | 545 endif # TOOLCHAIN=all |
| OLD | NEW |