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.
This commit is contained in:
Mike Hommey 2014-11-07 10:16:42 +09:00
Родитель de48f95673
Коммит 9cec4aee6b
2 изменённых файлов: 0 добавлений и 11 удалений

Просмотреть файл

@ -503,16 +503,6 @@ WIN32_EXE_LDFLAGS += -STACK:2097152
endif endif
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. # Include any personal overrides the user might think are needed.
# #

Просмотреть файл

@ -841,7 +841,6 @@ ifdef MOZ_PROFILE_GENERATE
touch -t `date +%Y%m%d%H%M.%S -d 'now+5seconds'` pgo.relink touch -t `date +%Y%m%d%H%M.%S -d 'now+5seconds'` pgo.relink
endif endif
endif # WINNT && !GCC endif # WINNT && !GCC
@$(RM) foodummyfilefoo $(DELETE_AFTER_LINK)
chmod +x $@ chmod +x $@
ifdef ENABLE_STRIP ifdef ENABLE_STRIP
$(STRIP) $(STRIP_FLAGS) $@ $(STRIP) $(STRIP_FLAGS) $@