Chromium Code Reviews| 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 # |
| (...skipping 311 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 322 ifneq (,$(findstring x86_64,$(ARCHES))) | 322 ifneq (,$(findstring x86_64,$(ARCHES))) |
| 323 all: $(OUTDIR)/$(1)_x86_64.nexe | 323 all: $(OUTDIR)/$(1)_x86_64.nexe |
| 324 $(OUTDIR)/$(1)_x86_64.nexe: $(foreach src,$(2),$(call SRC_TO_OBJ,$(src),_x86_64) ) $(foreach dep,$(4),$(STAMPDIR)/$(dep).stamp) | 324 $(OUTDIR)/$(1)_x86_64.nexe: $(foreach src,$(2),$(call SRC_TO_OBJ,$(src),_x86_64) ) $(foreach dep,$(4),$(STAMPDIR)/$(dep).stamp) |
| 325 $(call LOG,LINK,$$@,$(X86_64_LINK) -o $$@ $$(filter %.o,$$^) $(NACL_LDFL AGS) $(X86_64_LDFLAGS) $(foreach path,$(6),-L$(path)/$(TOOLCHAIN)_x86_64/$(CONFI G)) $(foreach lib,$(3),-l$(lib)) $(5)) | 325 $(call LOG,LINK,$$@,$(X86_64_LINK) -o $$@ $$(filter %.o,$$^) $(NACL_LDFL AGS) $(X86_64_LDFLAGS) $(foreach path,$(6),-L$(path)/$(TOOLCHAIN)_x86_64/$(CONFI G)) $(foreach lib,$(3),-l$(lib)) $(5)) |
| 326 $(call LOG,VALIDATE,$$@,$(NCVAL) $$@) | 326 $(call LOG,VALIDATE,$$@,$(NCVAL) $$@) |
| 327 endif | 327 endif |
| 328 | 328 |
| 329 ifneq (,$(findstring arm,$(ARCHES))) | 329 ifneq (,$(findstring arm,$(ARCHES))) |
| 330 all: $(OUTDIR)/$(1)_arm.nexe | 330 all: $(OUTDIR)/$(1)_arm.nexe |
| 331 $(OUTDIR)/$(1)_arm.nexe: $(foreach src,$(2),$(call SRC_TO_OBJ,$(src),_arm)) $(fo reach dep,$(4),$(STAMPDIR)/$(dep).stamp) | 331 $(OUTDIR)/$(1)_arm.nexe: $(foreach src,$(2),$(call SRC_TO_OBJ,$(src),_arm)) $(fo reach dep,$(4),$(STAMPDIR)/$(dep).stamp) |
| 332 » $(call LOG,LINK,$$@,$(ARM_LINK) -o $$@ $$(filter %.o,$$^) $(NACL_LDFLAGS ) $(ARM_LDFLAGS) $(foreach path,$(6),-L$(path)/$(TOOLCHAIN)_arm/$(CONFIG)) $(for each lib,$(3),-l$(lib)) $(5)) | 332 » $(call LOG,LINK,$$@,$(ARM_LINK) -static -o $$@ $$(filter %.o,$$^) $(NACL _LDFLAGS) $(ARM_LDFLAGS) $(foreach path,$(6),-L$(path)/$(TOOLCHAIN)_arm/$(CONFIG )) $(foreach lib,$(3),-l$(lib)) $(5)) |
|
Sam Clegg
2014/03/27 00:10:02
Make this bionic only? Or is it fine to add this
noelallen1
2014/03/27 18:13:48
Since the arm compiler only links statically now i
| |
| 333 $(call LOG,VALIDATE,$$@,$(NCVAL) $$@) | 333 $(call LOG,VALIDATE,$$@,$(NCVAL) $$@) |
| 334 endif | 334 endif |
| 335 endef | 335 endef |
| 336 | 336 |
| 337 | 337 |
| 338 # | 338 # |
| 339 # Generalized Link Macro | 339 # Generalized Link Macro |
| 340 # | 340 # |
| 341 # $1 = Target Name | 341 # $1 = Target Name |
| 342 # $2 = List of Sources | 342 # $2 = List of Sources |
| (...skipping 148 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 491 $(error Cannot run in sel_ldr unless $$NACL_ARCH is set) | 491 $(error Cannot run in sel_ldr unless $$NACL_ARCH is set) |
| 492 endif | 492 endif |
| 493 $(SEL_LDR_PATH) $(SEL_LDR_ARGS) $(OUTDIR)/$(TARGET)_$(NACL_ARCH).nexe -- $(EXE_ARGS) | 493 $(SEL_LDR_PATH) $(SEL_LDR_ARGS) $(OUTDIR)/$(TARGET)_$(NACL_ARCH).nexe -- $(EXE_ARGS) |
| 494 | 494 |
| 495 debug: all | 495 debug: all |
| 496 ifndef NACL_ARCH | 496 ifndef NACL_ARCH |
| 497 $(error Cannot run in sel_ldr unless $$NACL_ARCH is set) | 497 $(error Cannot run in sel_ldr unless $$NACL_ARCH is set) |
| 498 endif | 498 endif |
| 499 $(SEL_LDR_PATH) -d $(SEL_LDR_ARGS) $(OUTDIR)/$(TARGET)_$(NACL_ARCH).nexe -- $(EXE_ARGS) | 499 $(SEL_LDR_PATH) -d $(SEL_LDR_ARGS) $(OUTDIR)/$(TARGET)_$(NACL_ARCH).nexe -- $(EXE_ARGS) |
| 500 endif | 500 endif |
| OLD | NEW |