diff options
| author | David Tardon <dtardon@redhat.com> | 2012-05-08 07:43:31 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2012-05-20 14:18:46 +0200 |
| commit | b8c046acfc235cbfb09d598b502a66922045cabc (patch) | |
| tree | 1d9a1e7302c720b1d9888c080efeda6d2759d73f /odk | |
| parent | 2b657f5844f9362660c253322e4c4059d5875062 (diff) | |
only add -manifest:no for msc--mingw's ldd chokes on it
Change-Id: I3be2e72e5d4fbe879318e0cef48bfe0852f8bbbc
Diffstat (limited to 'odk')
| -rw-r--r-- | odk/source/unowinreg/win/makefile.mk | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/odk/source/unowinreg/win/makefile.mk b/odk/source/unowinreg/win/makefile.mk index 5ca5907b8d74..6f7ab7451d90 100644 --- a/odk/source/unowinreg/win/makefile.mk +++ b/odk/source/unowinreg/win/makefile.mk @@ -79,7 +79,6 @@ $(BIN)$/unowinreg.dll : $(TARFILE_LOCATION)/185d60944ea767075d27247c3162b3bc-uno # --- Files -------------------------------------------------------- -LINKFLAGS+=-MANIFEST:NO SLOFILES = \ $(SLO)$/unowinreg.obj SHL1TARGET=$(TARGET) @@ -93,6 +92,8 @@ SHL1STDLIBS += -lstdc++ SHL1STDLIBS += -lgcc_eh .ENDIF SHL1STDLIBS += -lgcc -lmingw32 -lmoldname -lmsvcrt +.ELSE +LINKFLAGS+=-MANIFEST:NO .ENDIF SHL1STDLIBS +=\ |