diff options
| author | Noel Power <noel.power@novell.com> | 2012-03-08 16:01:36 +0000 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-03-16 15:57:39 +0100 |
| commit | c6246139df005d6ac4627bc8f4665539effb6e94 (patch) | |
| tree | db017bc4c03f760fc2bf0388543bd7e94e6b1aec | |
| parent | a270cc4547c813ace05792d114998ee1199c30ff (diff) | |
fix uno bootstrapping for .NET ( and perhaps c++ ) fdo#46832
(cherry picked from commit c3d806be7d30a437607d924a4d33f13fe20dd1ba)
Signed-off-by: Michael Stahl <mstahl@redhat.com>
Signed-off-by: Fridrich Štrba <fridrich.strba@bluewin.ch>
| -rw-r--r-- | solenv/gbuild/platform/WNT_INTEL_MSC.mk | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk b/solenv/gbuild/platform/WNT_INTEL_MSC.mk index 11d2a1e08f7c..2cf856cb9d05 100644 --- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk +++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk @@ -368,7 +368,9 @@ $(call gb_Helper_abbreviate_dirs_native,\ $(if $(filter-out StaticLibrary,$(TARGETTYPE)),$(if $(gb_PRODUCT),,oldnames.lib $(if $(filter libcmtd,$(LINKED_LIBS)),,msvcrtd.lib) msvcprtd.lib kernel32.lib) 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 Executable,$(TARGETTYPE)),; if [ -f $@.manifest ]; then mt.exe $(MTFLAGS) -manifest $@.manifest -outputresource:$@\;1; fi) ; exit $$RC) + $(if $(filter Library,$(TARGETTYPE)),; if [ -f $(DLLTARGET).manifest ]; then mt.exe $(MTFLAGS) -manifest $(DLLTARGET).manifest -outputresource:$(DLLTARGET)\;2; fi) \ + $(if $(filter Executable,$(TARGETTYPE)),; if [ -f $(1).manifest ]; then mt.exe $(MTFLAGS) -manifest $(1).manifest -outputresource:$(1)\;1; fi) \ + ; exit $$RC) endef |