| Index: native_client_sdk/src/tools/nacl_gcc.mk
|
| diff --git a/native_client_sdk/src/tools/nacl_gcc.mk b/native_client_sdk/src/tools/nacl_gcc.mk
|
| index edd95a196f06110f8b2a8431e646e56ccd8ae1f2..7bd7ab6885c83385d4e1c10afb048288e3bb4919 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
|
|
|