diff options
| author | Petr Mladek <pmladek@suse.cz> | 2011-08-02 18:25:35 +0200 |
|---|---|---|
| committer | Andras Timar <atimar@suse.com> | 2012-10-13 12:24:49 +0200 |
| commit | f33aa7084834abdee8a02d9034b1ef68fd2bdfcc (patch) | |
| tree | fb333f98eeb583fa2128f2bff962faf1daf41ad8 /unoil | |
| parent | 608b20ea0550c2b4f0eff27a2d52e39c02c8445e (diff) | |
[mono] mono-climaker.diff: add mono support
merged with buildfix-climaker-disabled.diff: add mono support
merged with climaker-csharp-win.diff: add mono support
merged with buildfix-use-climaker-in-unoil.diff: add mono support
Conflicts:
unoil/climaker/makefile.mk
Change-Id: I4c0ec75954df7a34ed6f4173f84190ab10e62c4b
Diffstat (limited to 'unoil')
| -rw-r--r-- | unoil/CustomTarget_climaker.mk | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/unoil/CustomTarget_climaker.mk b/unoil/CustomTarget_climaker.mk index a19a3a504db1..a2c81c37cd13 100644 --- a/unoil/CustomTarget_climaker.mk +++ b/unoil/CustomTarget_climaker.mk @@ -65,10 +65,13 @@ $(unoil_CLIDIR)/$(CLI_OOOTYPES_POLICY_ASSEMBLY).dll : \ $(unoil_CLIDIR)/cli_oootypes.config \ $(unoil_CLIDIR)/cli_oootypes.dll $(OUTDIR)/bin/cliuno.snk $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),AL ,1) + # al in mono seems broken and doesn't allow -link with filenames containing path + $(GNUCOPY) $(unoil_CLIDIR)/cli_oootypes.config . $(call gb_Helper_abbreviate_dirs, \ - al -out:$@ \ + $(AL) -out:$@ \ -version:$(CLI_OOOTYPES_POLICY_VERSION) \ -keyfile:$(OUTDIR)/bin/cliuno.snk \ - -link:$<) + -link:cli_oootypes.config) + rm cli_oootypes.config # vim:set shiftwidth=4 tabstop=4 noexpandtab: |