diff options
| author | sbc <sbc@chromium.org> | 2015-02-27 19:09:09 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-02-28 03:09:51 +0000 |
| commit | aad9f37acd056092bf0ee579c328ed024ef41609 (patch) | |
| tree | d4a2da6e8d00057b3c0b39b12555d2000fa6b6d6 /native_client_sdk | |
| parent | 1c35162ea310ab09b3bb72fe1bfe95232db5d1a6 (diff) | |
| download | chromium_src-aad9f37acd056092bf0ee579c328ed024ef41609.zip chromium_src-aad9f37acd056092bf0ee579c328ed024ef41609.tar.gz chromium_src-aad9f37acd056092bf0ee579c328ed024ef41609.tar.bz2 | |
[NaCl SDK] Consistently honor LDFLAGS in SDK build system
host_gcc.mk was already honoring this variable, as was
the SO_RULE in nacl_gcc.mk but the LINK_RULE for nacl_gcc.mk
and nacl_llvm.mk was ignoring LDFLAGS.
Review URL: https://codereview.chromium.org/960963003
Cr-Commit-Position: refs/heads/master@{#318586}
Diffstat (limited to 'native_client_sdk')
| -rw-r--r-- | native_client_sdk/src/tools/nacl_gcc.mk | 6 | ||||
| -rw-r--r-- | native_client_sdk/src/tools/nacl_llvm.mk | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/native_client_sdk/src/tools/nacl_gcc.mk b/native_client_sdk/src/tools/nacl_gcc.mk index edd95a19..7bd7ab6 100644 --- a/native_client_sdk/src/tools/nacl_gcc.mk +++ b/native_client_sdk/src/tools/nacl_gcc.mk @@ -355,7 +355,7 @@ ifneq (,$(findstring x86_32,$(ARCHES))) all: $(X86_32_OUTDIR)/$(1)_x86_32.nexe $(X86_32_OUTDIR)/$(1)_x86_32.nexe: $(foreach src,$(2),$(call SRC_TO_OBJ,$(src),_x86_32)) $(foreach dep,$(4),$(STAMPDIR)/$(dep).stamp) $(MKDIR) -p $$(dir $$@) - $(call LOG,LINK,$$@,$(X86_32_LINK) -o $$@ $$(filter %.o,$$^) $(NACL_LDFLAGS) $(X86_32_LDFLAGS) $(foreach path,$(6),-L$(path)/$(TOOLCHAIN)_x86_32/$(CONFIG)) $(foreach lib,$(3),-l$(lib)) $(5)) + $(call LOG,LINK,$$@,$(X86_32_LINK) -o $$@ $$(filter %.o,$$^) $(NACL_LDFLAGS) $(X86_32_LDFLAGS) $(LDFLAGS) $(foreach path,$(6),-L$(path)/$(TOOLCHAIN)_x86_32/$(CONFIG)) $(foreach lib,$(3),-l$(lib)) $(5)) $(call LOG,VALIDATE,$$@,$(NCVAL) $$@) endif @@ -363,7 +363,7 @@ ifneq (,$(findstring x86_64,$(ARCHES))) all: $(X86_64_OUTDIR)/$(1)_x86_64.nexe $(X86_64_OUTDIR)/$(1)_x86_64.nexe: $(foreach src,$(2),$(call SRC_TO_OBJ,$(src),_x86_64)) $(foreach dep,$(4),$(STAMPDIR)/$(dep).stamp) $(MKDIR) -p $$(dir $$@) - $(call LOG,LINK,$$@,$(X86_64_LINK) -o $$@ $$(filter %.o,$$^) $(NACL_LDFLAGS) $(X86_64_LDFLAGS) $(foreach path,$(6),-L$(path)/$(TOOLCHAIN)_x86_64/$(CONFIG)) $(foreach lib,$(3),-l$(lib)) $(5)) + $(call LOG,LINK,$$@,$(X86_64_LINK) -o $$@ $$(filter %.o,$$^) $(NACL_LDFLAGS) $(X86_64_LDFLAGS) $(LDFLAGS) $(foreach path,$(6),-L$(path)/$(TOOLCHAIN)_x86_64/$(CONFIG)) $(foreach lib,$(3),-l$(lib)) $(5)) $(call LOG,VALIDATE,$$@,$(NCVAL) $$@) endif @@ -371,7 +371,7 @@ ifneq (,$(findstring arm,$(ARCHES))) all: $(ARM_OUTDIR)/$(1)_arm.nexe $(ARM_OUTDIR)/$(1)_arm.nexe: $(foreach src,$(2),$(call SRC_TO_OBJ,$(src),_arm)) $(foreach dep,$(4),$(STAMPDIR)/$(dep).stamp) $(MKDIR) -p $$(dir $$@) - $(call LOG,LINK,$$@,$(ARM_LINK) $(BIONIC_LINK) -o $$@ $$(filter %.o,$$^) $(NACL_LDFLAGS) $(ARM_LDFLAGS) $(foreach path,$(6),-L$(path)/$(TOOLCHAIN)_arm/$(CONFIG)) $(foreach lib,$(3),-l$(lib)) $(5)) + $(call LOG,LINK,$$@,$(ARM_LINK) $(BIONIC_LINK) -o $$@ $$(filter %.o,$$^) $(NACL_LDFLAGS) $(ARM_LDFLAGS) $(LDFLAGS) $(foreach path,$(6),-L$(path)/$(TOOLCHAIN)_arm/$(CONFIG)) $(foreach lib,$(3),-l$(lib)) $(5)) $(call LOG,VALIDATE,$$@,$(NCVAL) $$@) endif endef diff --git a/native_client_sdk/src/tools/nacl_llvm.mk b/native_client_sdk/src/tools/nacl_llvm.mk index e1ce7df..f7c607d 100644 --- a/native_client_sdk/src/tools/nacl_llvm.mk +++ b/native_client_sdk/src/tools/nacl_llvm.mk @@ -100,7 +100,7 @@ $(1).pexe: $(1).bc $(call LOG,FINALIZE,$$@,$(PNACL_FINALIZE) -o $$@ $$^) $(1).bc: $(2) $(foreach dep,$(4),$(STAMPDIR)/$(dep).stamp) - $(call LOG,LINK,$$@,$(PNACL_LINK) -o $$@ $(2) $(PNACL_LDFLAGS) $(foreach path,$(5),-L$(path)/pnacl/$(CONFIG)) $(foreach lib,$(3),-l$(lib)) $(6)) + $(call LOG,LINK,$$@,$(PNACL_LINK) -o $$@ $(2) $(PNACL_LDFLAGS) $(LDFLAGS) $(foreach path,$(5),-L$(path)/pnacl/$(CONFIG)) $(foreach lib,$(3),-l$(lib)) $(6)) $(1)_x86_32.nexe: $(1).bc $(call LOG,TRANSLATE,$$@,$(PNACL_TRANSLATE) --allow-llvm-bitcode-input -arch x86-32 $$^ -o $$@) |