diff options
| author | sbc@chromium.org <sbc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-01 00:43:12 +0000 |
|---|---|---|
| committer | sbc@chromium.org <sbc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-01 00:43:12 +0000 |
| commit | e3cfaac2a2c568b6847f5204e1d0bfc7af741936 (patch) | |
| tree | c8f82e96d9c7cbc37889cebe86cf196c6e26d9b5 /native_client_sdk | |
| parent | ded00dc9ab739a3b4ee7c9c800ae112b50a98c2a (diff) | |
| download | chromium_src-e3cfaac2a2c568b6847f5204e1d0bfc7af741936.zip chromium_src-e3cfaac2a2c568b6847f5204e1d0bfc7af741936.tar.gz chromium_src-e3cfaac2a2c568b6847f5204e1d0bfc7af741936.tar.bz2 | |
[NaCl SDK] Remove redundant output from SDK build system.
The 'rm' commands to remove libraries before creating
them was outputing warnings when the library did not
exist. This change adds a -f so the warning is not
printed.
R=binji@chromium.org
Review URL: https://codereview.chromium.org/54843007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@232251 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'native_client_sdk')
| -rw-r--r-- | native_client_sdk/src/tools/host_gcc.mk | 2 | ||||
| -rw-r--r-- | native_client_sdk/src/tools/nacl_gcc.mk | 8 | ||||
| -rw-r--r-- | native_client_sdk/src/tools/nacl_llvm.mk | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/native_client_sdk/src/tools/host_gcc.mk b/native_client_sdk/src/tools/host_gcc.mk index 594e33b..b732431 100644 --- a/native_client_sdk/src/tools/host_gcc.mk +++ b/native_client_sdk/src/tools/host_gcc.mk @@ -93,7 +93,7 @@ $(STAMPDIR)/$(1).stamp: $(LIBDIR)/$(OSNAME)_host/$(CONFIG)/lib$(1).a all: $(LIBDIR)/$(OSNAME)_host/$(CONFIG)/lib$(1).a $(LIBDIR)/$(OSNAME)_host/$(CONFIG)/lib$(1).a: $(foreach src,$(2),$(call SRC_TO_OBJ,$(src))) $(MKDIR) -p $$(dir $$@) - $(RM) $$@ + $(RM) -f $$@ $(call LOG,LIB,$$@,$(HOST_LIB) -cr $$@ $$^) endef diff --git a/native_client_sdk/src/tools/nacl_gcc.mk b/native_client_sdk/src/tools/nacl_gcc.mk index 5a3065d..675b464 100644 --- a/native_client_sdk/src/tools/nacl_gcc.mk +++ b/native_client_sdk/src/tools/nacl_gcc.mk @@ -229,14 +229,14 @@ ifneq (,$(findstring x86_32,$(ARCHES))) all: $(OUTDIR)/lib$(1)_x86_32.a $(OUTDIR)/lib$(1)_x86_32.a: $(foreach src,$(2),$(call SRC_TO_OBJ,$(src),_x86_32)) $(MKDIR) -p $$(dir $$@) - $(RM) $$@ + $(RM) -f $$@ $(call LOG,LIB ,$$@,$(X86_32_LIB) -cr $$@ $$^) $(STAMPDIR)/$(1).stamp: $(LIBDIR)/$(TOOLCHAIN)_x86_32/$(CONFIG)/lib$(1).a install: $(LIBDIR)/$(TOOLCHAIN)_x86_32/$(CONFIG)/lib$(1).a $(LIBDIR)/$(TOOLCHAIN)_x86_32/$(CONFIG)/lib$(1).a: $(OUTDIR)/lib$(1)_x86_32.a $(MKDIR) -p $$(dir $$@) - $(RM) $$@ + $(RM) -f $$@ $(call LOG,CP ,$$@,$(OSHELPERS) cp $$^ $$@) endif @@ -244,7 +244,7 @@ ifneq (,$(findstring x86_64,$(ARCHES))) all: $(OUTDIR)/lib$(1)_x86_64.a $(OUTDIR)/lib$(1)_x86_64.a: $(foreach src,$(2),$(call SRC_TO_OBJ,$(src),_x86_64)) $(MKDIR) -p $$(dir $$@) - $(RM) $$@ + $(RM) -f $$@ $(call LOG,LIB ,$$@,$(X86_64_LIB) -cr $$@ $$^) $(STAMPDIR)/$(1).stamp: $(LIBDIR)/$(TOOLCHAIN)_x86_64/$(CONFIG)/lib$(1).a @@ -259,7 +259,7 @@ ifneq ($(TOOLCHAIN),glibc) all: $(OUTDIR)/lib$(1)_arm.a $(OUTDIR)/lib$(1)_arm.a: $(foreach src,$(2),$(call SRC_TO_OBJ,$(src),_arm)) $(MKDIR) -p $$(dir $$@) - $(RM) $$@ + $(RM) -f $$@ $(call LOG,LIB ,$$@,$(ARM_LIB) -cr $$@ $$^) $(STAMPDIR)/$(1).stamp: $(LIBDIR)/$(TOOLCHAIN)_arm/$(CONFIG)/lib$(1).a diff --git a/native_client_sdk/src/tools/nacl_llvm.mk b/native_client_sdk/src/tools/nacl_llvm.mk index a3df271..16d6f2d 100644 --- a/native_client_sdk/src/tools/nacl_llvm.mk +++ b/native_client_sdk/src/tools/nacl_llvm.mk @@ -80,7 +80,7 @@ $(STAMPDIR)/$(1).stamp: $(LIBDIR)/$(TOOLCHAIN)/$(CONFIG)/lib$(1).a all: $(LIBDIR)/$(TOOLCHAIN)/$(CONFIG)/lib$(1).a $(LIBDIR)/$(TOOLCHAIN)/$(CONFIG)/lib$(1).a: $(foreach src,$(2),$(call SRC_TO_OBJ,$(src),_pnacl)) $(MKDIR) -p $$(dir $$@) - $(RM) $$@ + $(RM) -f $$@ $(call LOG,LIB,$$@,$(PNACL_LIB) -cr $$@ $$^ $(3)) endef |