From 846d21ec4c3220705f9a0676120b22bcd6d6b123 Mon Sep 17 00:00:00 2001
From: Mike Hommey <mh+mozilla@glandium.org>
Date: Fri, 7 Nov 2014 10:16:42 +0900
Subject: [PATCH] Bug 1094584 - Stop using the fake.lib trick. r=mshal

This used to be necessary to avoid the conflicting names between import
libraries and static libraries, but that's now prevented by the whole
moz.build machinery.
---
 config/config.mk | 10 ----------
 config/rules.mk  |  1 -
 2 files changed, 11 deletions(-)

diff --git a/config/config.mk b/config/config.mk
index a8900d1e083..9e447a36a64 100644
--- a/config/config.mk
+++ b/config/config.mk
@@ -503,16 +503,6 @@ WIN32_EXE_LDFLAGS	+= -STACK:2097152
 endif
 endif
 
-# If we're building a component on MSVC, we don't want to generate an
-# import lib, because that import lib will collide with the name of a
-# static version of the same library.
-ifeq ($(GNU_LD)$(OS_ARCH),WINNT)
-ifdef IS_COMPONENT
-LDFLAGS += -IMPLIB:fake.lib
-DELETE_AFTER_LINK = fake.lib fake.exp
-endif
-endif
-
 #
 # Include any personal overrides the user might think are needed.
 #
diff --git a/config/rules.mk b/config/rules.mk
index fc575768d8e..6515b4fdc3f 100644
--- a/config/rules.mk
+++ b/config/rules.mk
@@ -841,7 +841,6 @@ ifdef MOZ_PROFILE_GENERATE
 	touch -t `date +%Y%m%d%H%M.%S -d 'now+5seconds'` pgo.relink
 endif
 endif	# WINNT && !GCC
-	@$(RM) foodummyfilefoo $(DELETE_AFTER_LINK)
 	chmod +x $@
 ifdef ENABLE_STRIP
 	$(STRIP) $(STRIP_FLAGS) $@