diff options
| author | Michael Stahl <mstahl@redhat.com> | 2014-06-02 00:44:38 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2014-06-09 17:05:53 +0200 |
| commit | 0d2542d67ab77134e91317d45ea62e548a692067 (patch) | |
| tree | 8f05e7088cb2273474ed80ca151160808a2a03bd /solenv | |
| parent | fbbce4cb2b55576248e5770efe0ce562d729c09a (diff) | |
gbuild, cli_ure: Win32 make issues with back and forward slashes
It looks like what works is to give the source file names with
backslashes but everything else with forward slashes?
Change-Id: Iaf910ab5fc41984d1315a30b164a334d28344c16
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/CliAssembly.mk | 2 | ||||
| -rw-r--r-- | solenv/gbuild/CliLibrary.mk | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/solenv/gbuild/CliAssembly.mk b/solenv/gbuild/CliAssembly.mk index 5683ae7b2c2d..a745e8e1ec64 100644 --- a/solenv/gbuild/CliAssembly.mk +++ b/solenv/gbuild/CliAssembly.mk @@ -59,7 +59,7 @@ $(call gb_Helper_abbreviate_dirs,\ -nologo \ -out:$(CLI_ASSEMBLY_OUTFILE) \ -version:$(CLI_ASSEMBLY_VERSION) \ - -keyfile:$(call gb_Helper_windows_path,$(CLI_ASSEMBLY_KEYFILE)) \ + -keyfile:$(CLI_ASSEMBLY_KEYFILE) \ -link:$(CLI_ASSEMBLY_CONFIGFILE) \ $(if $(CLI_ASSEMBLY_PLATFORM),-platform:$(CLI_ASSEMBLY_PLATFORM)) && \ touch $(1) \ diff --git a/solenv/gbuild/CliLibrary.mk b/solenv/gbuild/CliLibrary.mk index 3883e7f63471..8c863a72e05a 100644 --- a/solenv/gbuild/CliLibrary.mk +++ b/solenv/gbuild/CliLibrary.mk @@ -33,20 +33,20 @@ endif gb_CliLibrary__get_source = $(SRCDIR)/$(1).cs gb_CliLibrary__get_generated_source = $(WORKDIR)/$(1).cs +# csc has silly problems handling files passed on command line define gb_CliLibrary__command $(call gb_Output_announce,$(2),$(true),CSC,3) -$(call gb_Helper_abbreviate_dirs,\ - csc $(call gb_Helper_windows_path, \ + csc \ $(call gb_CliLibrary__get_csflags) \ $(CLI_CSCFLAGS) \ -target:library \ -out:$(1) \ - -keyfile:$(call gb_Helper_windows_path,$(CLI_KEYFILE)) \ + -keyfile:$(CLI_KEYFILE) \ -reference:System.dll \ $(foreach assembly,$(CLI_ASSEMBLIES),-reference:$(assembly)) \ - $(CLI_SOURCES) \ - ) \ -) + $(subst /,\,$(CLI_SOURCES)) \ + + endef .PHONY : $(call gb_CliLibrary_get_clean_target,%) |