diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-08-24 09:47:17 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-08-24 09:48:24 +0200 |
| commit | 82bd284867aed5c7256b787881b3167bb266d831 (patch) | |
| tree | 7f20199c3106890058e69c8a94e4c3a52415f765 /instsetoo_native | |
| parent | fb17a057211e33cf52843a33bdb8d81134238975 (diff) | |
Do not attempt to create installation set when cross-compiling MinGW.
Diffstat (limited to 'instsetoo_native')
| -rw-r--r-- | instsetoo_native/util/makefile.mk | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/instsetoo_native/util/makefile.mk b/instsetoo_native/util/makefile.mk index 51125d130a94..a63e9322e519 100644 --- a/instsetoo_native/util/makefile.mk +++ b/instsetoo_native/util/makefile.mk @@ -79,9 +79,13 @@ allhelplangiso:=$(foreach,i,$(alllangiso) $(foreach,j,$(help_exist) $(eq,$i,$j xxxx: echo $(PERL) -w $(SOLARENV)$/bin$/gen_update_info.pl --buildid $(BUILD) --arch "$(RTL_ARCH)" --os "$(RTL_OS)" --lstfile $(PRJ)$/util$/openoffice.lst --product LibreOffice --languages $(subst,$(@:s/_/ /:1)_, $(@:b)) $(PRJ)$/util$/update.xml -.IF "$(GUI)"!="WNT" && "$(EPM)"=="NO" +.IF ( "$(GUI)"!="WNT" && "$(EPM)"=="NO" ) || ( "$(CROSS_COMPILING)"=="YES" && "$(GUI)$(COM)"=="WNTGCC" ) ALLTAR : $(LOCALPYFILES) +.IF "$(GUI)$(COM)"=="WNTGCC" + @echo "MinGW cross-compilation: unable to create installation set yet" +.ELSE @echo "No EPM: do no packaging at this stage" +.ENDIF .ELSE # "$(GUI)"!="WNT" && "$(EPM)"=="NO" .IF "$(ENABLE_RELEASE_BUILD)"=="TRUE" .IF "$(BUILD_TYPE)"=="$(BUILD_TYPE:s/ODK//)" |