mirror of
https://github.com/BepInEx/mono.git
synced 2026-11-17 01:41:17 -10:00
Skip AOTing profile assemblies if AOT_BUILD_FLAGS is not set
Fixes the issue froma4b3ba6177and6f4f3643c6. When building those profiles as part of runtime_preset=all, the AOT_BUILD_FLAGS variable is not set so AOTing doesn't work because the command line flag in rules.make is incomplete. We don't really need/want to AOT for runtime_preset=all, the point is just to make sure these BCL profiles still build.
This commit is contained in:
1 parent
7e6c33c3e7
commit
1d87187a1b
2 files changed
+24
-2
No files matched your search
+19
-2
@@ -845,8 +845,8 @@ elif test x$with_runtime_preset = xall; then
|
||||
with_monotouch_watch_default=yes
|
||||
with_monotouch_tv_default=yes
|
||||
with_xammac_default=yes
|
||||
# with_winaot_default=yes
|
||||
# with_orbis_default=yes
|
||||
with_winaot_default=yes
|
||||
with_orbis_default=yes
|
||||
elif test x$with_runtime_preset = xfullaot; then
|
||||
DISABLE_MCS_DOCS_default=yes
|
||||
with_testing_aot_full_default=yes
|
||||
@@ -906,6 +906,19 @@ elif test x$with_runtime_preset = xwinaot; then
|
||||
mono_feature_disable_reflection_emit='yes'
|
||||
mono_feature_disable_appdomains='yes'
|
||||
|
||||
AOT_BUILD_FLAGS="--aot=full,$INVARIANT_AOT_OPTIONS"
|
||||
AOT_RUN_FLAGS="--full-aot"
|
||||
elif test x$with_runtime_preset = xorbis; then
|
||||
DISABLE_MCS_DOCS_default=yes
|
||||
with_orbis_default=yes
|
||||
TEST_PROFILE=orbis
|
||||
|
||||
mono_feature_disable_com='yes'
|
||||
mono_feature_disable_remoting='yes'
|
||||
mono_feature_disable_reflection_emit_save='yes'
|
||||
mono_feature_disable_reflection_emit='yes'
|
||||
mono_feature_disable_appdomains='yes'
|
||||
|
||||
AOT_BUILD_FLAGS="--aot=full,$INVARIANT_AOT_OPTIONS"
|
||||
AOT_RUN_FLAGS="--full-aot"
|
||||
else
|
||||
@@ -991,6 +1004,9 @@ fi
|
||||
if test -z "$INSTALL_WINAOT_TRUE"; then :
|
||||
default_profile=winaot
|
||||
fi
|
||||
if test -z "$INSTALL_ORBIS_TRUE"; then :
|
||||
default_profile=orbis
|
||||
fi
|
||||
if test -z "$INSTALL_4_x_TRUE"; then :
|
||||
default_profile=net_4_x
|
||||
fi
|
||||
@@ -4575,6 +4591,7 @@ echo "
|
||||
Xamarin.TVOS: $with_monotouch_tv
|
||||
Xamarin.Mac: $with_xammac
|
||||
Windows AOT: $with_winaot
|
||||
Orbis: $with_orbis
|
||||
Test profiles: AOT Full ($with_testing_aot_full), AOT Hybrid ($with_testing_aot_hybrid)
|
||||
JNI support: $jdk_headers_found
|
||||
libgdiplus: $libgdiplus_msg
|
||||
|
||||
@@ -190,7 +190,12 @@ AOT_PROFILE_ASSEMBLIES := $(sort $(patsubst .//%,%,$(filter-out %.dll.dll %.exe.
|
||||
|
||||
# This can run in parallel
|
||||
.PHONY: aot-all-profile
|
||||
ifdef AOT_BUILD_FLAGS
|
||||
aot-all-profile: $(patsubst %,%$(PLATFORM_AOT_SUFFIX),$(AOT_PROFILE_ASSEMBLIES))
|
||||
else
|
||||
aot-all-profile:
|
||||
echo AOT_BUILD_FLAGS not set, skipping AOT.
|
||||
endif
|
||||
|
||||
%.dll$(PLATFORM_AOT_SUFFIX): %.dll
|
||||
@ mkdir -p $<_bitcode_tmp
|
||||
|
||||
Reference in new issue
Block a user