projects
/
mono.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
798a08c
)
[build] Fixes profile path for aot compilation
author
Marek Safar
<marek.safar@gmail.com>
Wed, 31 May 2017 06:44:35 +0000
(08:44 +0200)
committer
Marek Safar
<marek.safar@gmail.com>
Wed, 31 May 2017 06:45:16 +0000
(08:45 +0200)
mcs/class/aot-compiler/Makefile
patch
|
blob
|
history
diff --git
a/mcs/class/aot-compiler/Makefile
b/mcs/class/aot-compiler/Makefile
index 9cd987fabb54d3737dabbaf25aa38a4dba2c437f..d070a293e3680d8ed0e22f05c90918f313f93dd2 100644
(file)
--- a/
mcs/class/aot-compiler/Makefile
+++ b/
mcs/class/aot-compiler/Makefile
@@
-8,7
+8,7
@@
thisdir = class/aot-compiler
include ../../build/rules.make
include ../../build/rules.make
-the_libdir = $(topdir)/class/lib/$(PROFILE)/
+the_libdir = $(topdir)/class/lib/$(PROFILE
_DIRECTORY
)/
CSC_DIR = $(dir $(CSC_LOCATION))
# The directory where the AOT images are stored
images_dir = $(the_libdir)
CSC_DIR = $(dir $(CSC_LOCATION))
# The directory where the AOT images are stored
images_dir = $(the_libdir)
@@
-38,6
+38,8
@@
runtime_dep = $(dir $(RUNTIME))/../mono/mini/mono
PROGRAM_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)
LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)
PROGRAM_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)
LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)
+LOG_FILE = $(PROFILE_DIRECTORY)_aot.log
+
ifndef SKIP_AOT
profile_file:=$(wildcard $(topdir)/class/lib/build/csc.*.aotprofile)
ifndef SKIP_AOT
profile_file:=$(wildcard $(topdir)/class/lib/build/csc.*.aotprofile)
@@
-50,32
+52,32
@@
endif
ifdef PLATFORM_AOT_SUFFIX
$(mcs_aot_image): $(mcs_exe) $(mscorlib_dll) $(runtime_dep)
ifdef PLATFORM_AOT_SUFFIX
$(mcs_aot_image): $(mcs_exe) $(mscorlib_dll) $(runtime_dep)
- $(Q_AOT) MONO_PATH='$(the_libdir)' > $(
PROFILE)_aot.log 2>&1 $(RUNTIME) --aot=bind-to-runtime-version$(profile_arg),outfile=$(mcs_aot_image) --debug $(mcs_exe) || cat $(PROFILE)_aot.log || (cat $(PROFILE)_aot.log
; exit 1)
+ $(Q_AOT) MONO_PATH='$(the_libdir)' > $(
LOG_FILE) 2>&1 $(RUNTIME) --aot=bind-to-runtime-version$(profile_arg),outfile=$(mcs_aot_image) --debug $(mcs_exe) || cat $(LOG_FILE) || (cat $(LOG_FILE)
; exit 1)
$(csc_aot_image): $(csc_exe) $(mscorlib_dll) $(runtime_dep)
$(csc_aot_image): $(csc_exe) $(mscorlib_dll) $(runtime_dep)
- $(Q_AOT) MONO_PATH='$(the_libdir)' > $(
PROFILE)_aot.log 2>&1 $(RUNTIME) --aot=bind-to-runtime-version$(profile_arg),outfile=$(csc_aot_image) --debug $(csc_exe) || cat $(PROFILE)_aot.log || (cat $(PROFILE)_aot.log
; exit 1)
+ $(Q_AOT) MONO_PATH='$(the_libdir)' > $(
LOG_FILE) 2>&1 $(RUNTIME) --aot=bind-to-runtime-version$(profile_arg),outfile=$(csc_aot_image) --debug $(csc_exe) || cat $(LOG_FILE) || (cat $(LOG_FILE)
; exit 1)
$(mscorlib_aot_image): $(mscorlib_dll) $(runtime_dep)
$(mscorlib_aot_image): $(mscorlib_dll) $(runtime_dep)
- $(Q_AOT) MONO_PATH='$(the_libdir)' > $(
PROFILE)_aot.log 2>&1 $(RUNTIME) --aot=bind-to-runtime-version$(profile_arg) --debug $(mscorlib_dll) || (cat $(PROFILE)_aot.log
; exit 1)
+ $(Q_AOT) MONO_PATH='$(the_libdir)' > $(
LOG_FILE) 2>&1 $(RUNTIME) --aot=bind-to-runtime-version$(profile_arg) --debug $(mscorlib_dll) || (cat $(LOG_FILE)
; exit 1)
$(csc_MC_image): $(csc_MC_dll) $(runtime_dep)
$(csc_MC_image): $(csc_MC_dll) $(runtime_dep)
- $(Q_AOT) MONO_PATH='$(the_libdir)' > $(
PROFILE)_aot.log 2>&1 $(RUNTIME) --aot=bind-to-runtime-version$(profile_arg),outfile=$(csc_MC_image) --debug $(csc_MC_dll) || (cat $(PROFILE)_aot.log
; exit 1)
+ $(Q_AOT) MONO_PATH='$(the_libdir)' > $(
LOG_FILE) 2>&1 $(RUNTIME) --aot=bind-to-runtime-version$(profile_arg),outfile=$(csc_MC_image) --debug $(csc_MC_dll) || (cat $(LOG_FILE)
; exit 1)
$(csc_MCS_image): $(csc_MCS_dll) $(runtime_dep)
$(csc_MCS_image): $(csc_MCS_dll) $(runtime_dep)
- $(Q_AOT) MONO_PATH='$(the_libdir)' > $(
PROFILE)_aot.log 2>&1 $(RUNTIME) --aot=bind-to-runtime-version$(profile_arg),outfile=$(csc_MCS_image) --debug $(csc_MCS_dll) || (cat $(PROFILE)_aot.log
; exit 1)
+ $(Q_AOT) MONO_PATH='$(the_libdir)' > $(
LOG_FILE) 2>&1 $(RUNTIME) --aot=bind-to-runtime-version$(profile_arg),outfile=$(csc_MCS_image) --debug $(csc_MCS_dll) || (cat $(LOG_FILE)
; exit 1)
$(csc_SRM_image): $(csc_SRM_dll) $(runtime_dep)
$(csc_SRM_image): $(csc_SRM_dll) $(runtime_dep)
- $(Q_AOT) MONO_PATH='$(the_libdir)' > $(
PROFILE)_aot.log 2>&1 $(RUNTIME) --aot=bind-to-runtime-version$(profile_arg),outfile=$(csc_SRM_image) --debug --apply-bindings=$(csc_exe).config $(csc_SRM_dll) || (cat $(PROFILE)_aot.log
; exit 1)
+ $(Q_AOT) MONO_PATH='$(the_libdir)' > $(
LOG_FILE) 2>&1 $(RUNTIME) --aot=bind-to-runtime-version$(profile_arg),outfile=$(csc_SRM_image) --debug --apply-bindings=$(csc_exe).config $(csc_SRM_dll) || (cat $(LOG_FILE)
; exit 1)
$(csc_SCI_image): $(csc_SCI_dll) $(runtime_dep)
$(csc_SCI_image): $(csc_SCI_dll) $(runtime_dep)
- $(Q_AOT) MONO_PATH='$(the_libdir)' > $(
PROFILE)_aot.log 2>&1 $(RUNTIME) --aot=bind-to-runtime-version$(profile_arg),outfile=$(csc_SCI_image) --debug $(csc_SCI_dll) || (cat $(PROFILE)_aot.log
; exit 1)
+ $(Q_AOT) MONO_PATH='$(the_libdir)' > $(
LOG_FILE) 2>&1 $(RUNTIME) --aot=bind-to-runtime-version$(profile_arg),outfile=$(csc_SCI_image) --debug $(csc_SCI_dll) || (cat $(LOG_FILE)
; exit 1)
ifdef ENABLE_AOT
CSC_IMAGES = $(csc_aot_image) $(csc_SRM_image) $(csc_SCI_image) $(csc_MC_image) $(csc_MCS_image)
clean-local:
ifdef ENABLE_AOT
CSC_IMAGES = $(csc_aot_image) $(csc_SRM_image) $(csc_SCI_image) $(csc_MC_image) $(csc_MCS_image)
clean-local:
- -rm -f $(mscorlib_aot_image) $(mcs_aot_image) $(CSC_IMAGES) $(
PROFILE)_aot.log
+ -rm -f $(mscorlib_aot_image) $(mcs_aot_image) $(CSC_IMAGES) $(
LOG_FILE)
# AOT build profile to speed up build
ifeq ($(PROFILE),build)
# AOT build profile to speed up build
ifeq ($(PROFILE),build)