diff options
| author | Matúš Kukan <matus.kukan@gmail.com> | 2012-08-06 16:40:24 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2012-09-22 08:15:24 +0200 |
| commit | 31237d6a6ac9d6d1c5c4db7ae46f280299c06bba (patch) | |
| tree | 44ca63a21eef576cb3214908c118393782480c03 | |
| parent | f8361efd12462e0776b96214e1f24890ababec5c (diff) | |
get cli_ure closer to successful build
Change-Id: I28ba1f4e802b3736a9f82966a2c7908388df4a92
| -rw-r--r-- | solenv/gbuild/CliLibrary.mk | 5 | ||||
| -rw-r--r-- | solenv/gbuild/CliNativeLibrary.mk | 2 | ||||
| -rw-r--r-- | solenv/gbuild/Helper.mk | 5 |
3 files changed, 9 insertions, 3 deletions
diff --git a/solenv/gbuild/CliLibrary.mk b/solenv/gbuild/CliLibrary.mk index 62c9d78255ad..bf2c88c1596c 100644 --- a/solenv/gbuild/CliLibrary.mk +++ b/solenv/gbuild/CliLibrary.mk @@ -36,14 +36,15 @@ gb_CliLibraryTarget__get_generated_source = $(WORKDIR)/$(1).cs define gb_CliLibraryTarget__command $(call gb_Output_announce,$(2),$(true),CSC,3) $(call gb_Helper_abbreviate_dirs,\ - csc \ + csc $(call gb_Helper_windows_path, \ $(call gb_CliLibraryTarget__get_csflags) \ $(CLI_CSCFLAGS) \ -target:library \ -out:$(1) \ -reference:System.dll \ - $(foreach assembly,$(CLI_ASSEMBLIES),-reference:$(assembly).dll) \ + $(foreach assembly,$(CLI_ASSEMBLIES),-reference:$(assembly)) \ $(CLI_SOURCES) \ + ) \ ) endef diff --git a/solenv/gbuild/CliNativeLibrary.mk b/solenv/gbuild/CliNativeLibrary.mk index 2324211b15ac..87909da4e754 100644 --- a/solenv/gbuild/CliNativeLibrary.mk +++ b/solenv/gbuild/CliNativeLibrary.mk @@ -35,7 +35,7 @@ $(call gb_CliNativeLibraryTarget_get_target,%) : $(call gb_CliNativeLibraryTarget_get_clean_target,%) : $(call gb_Output_announce,$*,$(false),SN ,4) $(call gb_Helper_abbreviate_dirs,\ - rm -r $(call gb_CliNativeLibraryTarget_get_target,$*) \ + rm -rf $(call gb_CliNativeLibraryTarget_get_target,$*) \ ) define gb_CliNativeLibraryTarget_CliNativeLibraryTarget diff --git a/solenv/gbuild/Helper.mk b/solenv/gbuild/Helper.mk index 176f5ffb1173..a1aa433e8034 100644 --- a/solenv/gbuild/Helper.mk +++ b/solenv/gbuild/Helper.mk @@ -53,6 +53,11 @@ define gb_Helper_native_path $(call gb_Output_error,gb_Helper_native_path: Do not use. Should not be necessary.) endef +# cygwin seems to eat one backslash when executing command, thus replace with '\\' +define gb_Helper_windows_path +$(subst /,\\,$(1)) +endef + define gb_Helper_make_clean_target gb_$(1)_get_clean_target = $(WORKDIR)/Clean/$(1)/$$(1) |