diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-04-21 18:06:17 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-04-21 23:36:35 +0200 |
| commit | 1ae59b52e302491ffcd97bde25a6dd68bf109123 (patch) | |
| tree | adfd06c3ce2bd0a2425f87b1365364d07ef5b5d9 /solenv/gbuild/platform | |
| parent | 8ecf0d45d8301b95385eda64671df828c3003c62 (diff) | |
gbuild: fix spurious delivering of import libs (MSVC)
The DLL aux-target is always newer than the work-dir import lib,
which causes spurious re-delivery of the solver import lib.
Touch the DLL file to the same timestamp as the import lib
to prevent this.
Change-Id: I8394201c7a672a50db3af51b9442f8992cdef1d1
Diffstat (limited to 'solenv/gbuild/platform')
| -rwxr-xr-x | solenv/gbuild/platform/com_MSC_class.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/solenv/gbuild/platform/com_MSC_class.mk b/solenv/gbuild/platform/com_MSC_class.mk index 36f973dd988b..6457e9cd6ee7 100755 --- a/solenv/gbuild/platform/com_MSC_class.mk +++ b/solenv/gbuild/platform/com_MSC_class.mk @@ -213,8 +213,8 @@ $(call gb_Helper_abbreviate_dirs,\ $(if $(filter-out StaticLibrary,$(TARGETTYPE)),user32.lib) \ $(if $(DLLTARGET),-out:$(DLLTARGET) -implib:$(1),-out:$(1)); RC=$$?; rm $${RESPONSEFILE} \ $(if $(DLLTARGET),; if [ ! -f $(DLLTARGET) ]; then rm -f $(1) && false; fi) \ - $(if $(filter Library,$(TARGETTYPE)),; if [ -f $(DLLTARGET).manifest ]; then mt.exe $(MTFLAGS) -nologo -manifest $(DLLTARGET).manifest -outputresource:$(DLLTARGET)\;2; fi) \ - $(if $(filter Executable,$(TARGETTYPE)),; if [ -f $(1).manifest ]; then mt.exe $(MTFLAGS) -nologo -manifest $(1).manifest -outputresource:$(1)\;1; fi) \ + $(if $(filter Library,$(TARGETTYPE)),&& if [ -f $(DLLTARGET).manifest ]; then mt.exe $(MTFLAGS) -nologo -manifest $(DLLTARGET).manifest -outputresource:$(DLLTARGET)\;2 && touch -r $(1) $(DLLTARGET).manifest $(DLLTARGET); fi) \ + $(if $(filter Executable,$(TARGETTYPE)),&& if [ -f $(1).manifest ]; then mt.exe $(MTFLAGS) -nologo -manifest $(1).manifest -outputresource:$(1)\;1 && touch -r $(1) $(1).manifest; fi) \ ; exit $$RC) endef |