diff options
| author | Zoltan Varga <vargaz@gmail.com> | 2016-12-22 04:39:01 +0300 |
|---|---|---|
| committer | Zoltan Varga <vargaz@gmail.com> | 2016-12-22 04:39:01 +0300 |
| commit | 4fe7a65f4fabc425a86b169c525496b55d92e183 (patch) | |
| tree | 7a14d739b49f7b8be6823661783c0b7e59dea256 /mcs/class/aot-compiler | |
| parent | 56498ccc8f5802bd55a48f94e6c7db9128720568 (diff) | |
[build] Generate all aot images for csc into the profile directory instead of next to the corresponding assembly so the external/roslyn-binaries submodule doesn't get dirty. Pass the --aot-path argument to the runtime so it picks up the aot images.
Diffstat (limited to 'mcs/class/aot-compiler')
| -rw-r--r-- | mcs/class/aot-compiler/Makefile | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/mcs/class/aot-compiler/Makefile b/mcs/class/aot-compiler/Makefile index 9730a5a5776..923311a89d1 100644 --- a/mcs/class/aot-compiler/Makefile +++ b/mcs/class/aot-compiler/Makefile @@ -10,21 +10,23 @@ include ../../build/rules.make the_libdir = $(topdir)/class/lib/$(PROFILE)/ CSC_DIR = $(dir $(CSC_LOCATION)) +# The directory where the AOT images are stored +images_dir = $(the_libdir) # mcs.exe is only in the build profile, but the aot image should be compiled against the current # profile mcs_exe = $(the_libdir)/mcs.exe mcs_aot_image = $(the_libdir)/mcs.exe$(PLATFORM_AOT_SUFFIX) csc_exe = $(CSC_LOCATION) -csc_aot_image = $(csc_exe)$(PLATFORM_AOT_SUFFIX) +csc_aot_image = $(images_dir)/csc.exe$(PLATFORM_AOT_SUFFIX) csc_MCS_dll = $(CSC_DIR)/Microsoft.CodeAnalysis.CSharp.dll -csc_MCS_image = $(csc_MCS_dll)$(PLATFORM_AOT_SUFFIX) +csc_MCS_image = $(images_dir)/Microsoft.CodeAnalysis.CSharp.dll$(PLATFORM_AOT_SUFFIX) csc_MC_dll = $(CSC_DIR)/Microsoft.CodeAnalysis.dll -csc_MC_image = $(csc_MC_dll)$(PLATFORM_AOT_SUFFIX) +csc_MC_image = $(images_dir)/Microsoft.CodeAnalysis.dll$(PLATFORM_AOT_SUFFIX) csc_SRM_dll = $(CSC_DIR)/System.Reflection.Metadata.dll -csc_SRM_image = $(csc_SRM_dll)$(PLATFORM_AOT_SUFFIX) +csc_SRM_image = $(images_dir)/System.Reflection.Metadata.dll$(PLATFORM_AOT_SUFFIX) csc_SCI_dll = $(CSC_DIR)/System.Collections.Immutable.dll -csc_SCI_image = $(csc_SCI_dll)$(PLATFORM_AOT_SUFFIX) +csc_SCI_image = $(images_dir)/System.Collections.Immutable.dll$(PLATFORM_AOT_SUFFIX) mscorlib_dll = $(the_libdir)/mscorlib.dll mscorlib_aot_image = $(mscorlib_dll)$(PLATFORM_AOT_SUFFIX) |