Chromium Code Reviews Chromium Code Reviews
Issue 15974011:
[NaCl SDK] Remove NACL_ARCH from commom makefiles. (Closed)
Base URL: http://git.chromium.org/chromium/src.git@cleanup_genhttpfs| 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 | 11 |
| 12 # | 12 # |
| 13 # Macros for TOOLS | 13 # Macros for TOOLS |
| 14 # | 14 # |
| 15 # We use the C++ compiler for everything and then use the -Wl,-as-needed flag | 15 # We use the C++ compiler for everything and then use the -Wl,-as-needed flag |
| 16 # in the linker to drop libc++ unless it's actually needed. | 16 # in the linker to drop libc++ unless it's actually needed. |
| 17 # | 17 # |
| 18 HOST_CC ?= cl.exe /nologo | 18 HOST_CC ?= cl.exe /nologo |
| 19 HOST_CXX ?= cl.exe /nologo /EHsc | 19 HOST_CXX ?= cl.exe /nologo /EHsc |
| 20 HOST_LINK ?= link.exe /nologo | 20 HOST_LINK ?= link.exe /nologo |
| 21 HOST_LIB ?= lib.exe /nologo | 21 HOST_LIB ?= lib.exe /nologo |
| 22 | 22 |
| 23 ifeq (,$(findstring cl.exe,$(shell $(WHICH) cl.exe))) | 23 ifeq (,$(findstring cl.exe,$(shell $(WHICH) cl.exe))) |
| 24 $(warning To skip the host build use:) | 24 $(warning To skip the host build use:) |
| 25 $(warning "make NO_HOST_BUILDS=1") | 25 $(warning "make NO_HOST_BUILDS=1") |
| 26 $(error Unable to find cl.exe in PATH while building Windows host build) | 26 $(error Unable to find cl.exe in PATH while building Windows host build) |
| 27 endif | 27 endif |
| 28 | 28 |
| 29 | 29 |
| 30 ifeq ('Debug','$(CONFIG)') | 30 ifeq ($(CONFIG),Release) |
|
Sam Clegg
2013/05/30 17:40:19
This is now consistent with the corresponding chec
| |
| 31 WIN_OPT_FLAGS ?= /Od /MTd /Z7 -D NACL_SDK_DEBUG | 31 WIN_OPT_FLAGS ?= /O2 /MT /Z7 |
| 32 else | 32 else |
| 33 WIN_OPT_FLAGS ?= /O2 /MT /Z7 | 33 WIN_OPT_FLAGS ?= /Od /MTd /Z7 -DNACL_SDK_DEBUG |
| 34 endif | 34 endif |
| 35 | 35 |
| 36 WIN_FLAGS ?= -D WIN32 -D _WIN32 -D PTW32_STATIC_LIB | 36 WIN_FLAGS ?= -DWIN32 -D_WIN32 -DPTW32_STATIC_LIB |
| 37 | 37 |
| 38 | 38 |
| 39 # | 39 # |
| 40 # Individual Macros | 40 # Individual Macros |
| 41 # | 41 # |
| 42 # $1 = Source Name | 42 # $1 = Source Name |
| 43 # $2 = Compile Flags | 43 # $2 = Compile Flags |
| 44 # | 44 # |
| 45 define C_COMPILER_RULE | 45 define C_COMPILER_RULE |
| 46 $(call SRC_TO_OBJ,$(1)): $(1) $(TOP_MAKE) | $(dir $(call SRC_TO_OBJ,$(1)))dir.st amp | 46 $(call SRC_TO_OBJ,$(1)): $(1) $(TOP_MAKE) | $(dir $(call SRC_TO_OBJ,$(1)))dir.st amp |
| (...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 124 # $1 = Target Name | 124 # $1 = Target Name |
| 125 # $2 = Input Name | 125 # $2 = Input Name |
| 126 # | 126 # |
| 127 define STRIP_RULE | 127 define STRIP_RULE |
| 128 all: $(OUTDIR)/$(1)$(HOST_EXT) | 128 all: $(OUTDIR)/$(1)$(HOST_EXT) |
| 129 $(OUTDIR)/$(1)$(HOST_EXT): $(OUTDIR)/$(2)$(HOST_EXT) | 129 $(OUTDIR)/$(1)$(HOST_EXT): $(OUTDIR)/$(2)$(HOST_EXT) |
| 130 $(call LOG,COPY,$$@,$(CP) $$^ $$@) | 130 $(call LOG,COPY,$$@,$(CP) $$^ $$@) |
| 131 endef | 131 endef |
| 132 | 132 |
| 133 all : $(LIB_LIST) $(DEPS_LIST) | 133 all : $(LIB_LIST) $(DEPS_LIST) |
| OLD | NEW |
