Skip to content

Commit dd7aca6

Browse files
committed
[runtime] Use a set of properties to pass common configure flags
DRY - do not repeat configure args across various runtimes.
1 parent 237964a commit dd7aca6

File tree

2 files changed

+9
-7
lines changed

2 files changed

+9
-7
lines changed

build-tools/mono-runtimes/mono-runtimes.projitems

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@
167167
<Objdump>$(AndroidMxeFullPath)\bin\$(MingwCommandPrefix64)-objdump</Objdump>
168168
<RanLib>$(AndroidMxeFullPath)\bin\$(MingwCommandPrefix64)-ranlib</RanLib>
169169
<Strip>$(AndroidMxeFullPath)\bin\$(MingwCommandPrefix64)-strip</Strip>
170-
<ConfigureFlags>PATH="$PATH:$(AndroidMxeFullPath)\bin" --host=$(MingwCommandPrefix64) --target=$(MingwCommandPrefix64) --disable-boehm --enable-mcs-build=no --enable-nls=no --enable-maintainer-mode --with-monodroid --disable-llvm ac_cv_header_zlib_h=no ac_cv_search_dlopen=no</ConfigureFlags>
170+
<ConfigureFlags>PATH="$PATH:$(AndroidMxeFullPath)\bin" --host=$(MingwCommandPrefix64) --target=$(MingwCommandPrefix64) $(_CommonHostConfigureFlags) --disable-dynamic-btls --disable-mcs-build --disable-llvm ac_cv_header_zlib_h=no ac_cv_search_dlopen=no</ConfigureFlags>
171171
<NativeLibraryExtension>dll</NativeLibraryExtension>
172172
<OutputRuntimeFilename>libmonosgen-2.0</OutputRuntimeFilename>
173173
<OutputProfilerFilename></OutputProfilerFilename>
@@ -190,7 +190,7 @@
190190
<Objdump>$(AndroidMxeFullPath)\bin\$(MingwCommandPrefix32)-objdump</Objdump>
191191
<RanLib>$(AndroidMxeFullPath)\bin\$(MingwCommandPrefix32)-ranlib</RanLib>
192192
<Strip>$(AndroidMxeFullPath)\bin\$(MingwCommandPrefix32)-strip</Strip>
193-
<ConfigureFlags>PATH="$PATH:$(AndroidMxeFullPath)\bin" --host=$(MingwCommandPrefix32) --target=$(MingwCommandPrefix32) --disable-boehm --enable-mcs-build=no --enable-nls=no --enable-maintainer-mode --with-monodroid --disable-llvm ac_cv_header_zlib_h=no ac_cv_search_dlopen=no</ConfigureFlags>
193+
<ConfigureFlags>PATH="$PATH:$(AndroidMxeFullPath)\bin" --host=$(MingwCommandPrefix32) --target=$(MingwCommandPrefix32) $(_CommonHostConfigureFlags) --disable-dynamic-btls --disable-mcs-build --disable-llvm ac_cv_header_zlib_h=no ac_cv_search_dlopen=no</ConfigureFlags>
194194
<NativeLibraryExtension>dll</NativeLibraryExtension>
195195
<OutputRuntimeFilename>libmonosgen-2.0</OutputRuntimeFilename>
196196
<OutputProfilerFilename></OutputProfilerFilename>
@@ -211,7 +211,7 @@
211211
<RanLib>ranlib</RanLib>
212212
<Strip>strip</Strip>
213213
<StripFlags>-S</StripFlags>
214-
<ConfigureFlags>--enable-dynamic-btls --enable-maintainer-mode --without-ikvm-native --with-monodroid --with-mcs-docs=no --disable-mono-debugger --with-profile4_x=no --disable-boehm --enable-nls=no --disable-iconv</ConfigureFlags>
214+
<ConfigureFlags>$(_CommonHostConfigureFlags)</ConfigureFlags>
215215
<OutputRuntimeFilename>libmonosgen-2.0</OutputRuntimeFilename>
216216
<NativeLibraryExtension>dylib</NativeLibraryExtension>
217217
<OutputProfilerFilename>libmono-profiler-log</OutputProfilerFilename>
@@ -232,7 +232,7 @@
232232
<RanLib>ranlib</RanLib>
233233
<Strip>strip</Strip>
234234
<StripFlags>-S</StripFlags>
235-
<ConfigureFlags>--enable-dynamic-btls --enable-maintainer-mode --without-ikvm-native --with-monodroid --with-mcs-docs=no --disable-mono-debugger --with-profile4_x=no --disable-boehm --enable-nls=no --disable-iconv</ConfigureFlags>
235+
<ConfigureFlags>$(_CommonHostConfigureFlags)</ConfigureFlags>
236236
<OutputRuntimeFilename>libmonosgen-2.0</OutputRuntimeFilename>
237237
<NativeLibraryExtension>so</NativeLibraryExtension>
238238
<OutputProfilerFilename>libmono-profiler-log</OutputProfilerFilename>

build-tools/mono-runtimes/mono-runtimes.props

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,11 @@
55
<_CommonCFlags Condition=" '$(Configuration)' == 'Release' ">-g -O2</_CommonCFlags>
66
<_HostWinCFlags Condition=" '$(Configuration)' == 'Debug' ">-ggdb3 -O0 -DXAMARIN_PRODUCT_VERSION=0</_HostWinCFlags>
77
<_HostWinCFlags Condition=" '$(Configuration)' == 'Release' ">-g -O2 -DXAMARIN_PRODUCT_VERSION=0</_HostWinCFlags>
8-
<_BtlsConfigureFlags>--enable-dynamic-btls --with-btls-android-ndk=$(AndroidToolchainDirectory)\ndk</_BtlsConfigureFlags>
9-
<_CommonConfigureFlags>--without-ikvm-native --enable-maintainer-mode --with-profile4_x=no --with-monodroid --enable-nls=no --with-sigaltstack=yes --with-tls=pthread mono_cv_uscore=yes</_CommonConfigureFlags>
10-
<_TargetConfigureFlags>$(_CommonConfigureFlags) --enable-minimal=ssa,interpreter,portability,attach,verifier,full_messages,sgen_remset,sgen_marksweep_par,sgen_marksweep_fixed,sgen_marksweep_fixed_par,sgen_copying,logging,security,shared_handles --disable-mcs-build --disable-executables --disable-iconv --disable-boehm $(_BtlsConfigureFlags)</_TargetConfigureFlags>
8+
<_BtlsConfigureFlags>--with-btls-android-ndk=$(AndroidToolchainDirectory)\ndk</_BtlsConfigureFlags>
9+
<_CommonConfigureFlags>--without-ikvm-native --enable-maintainer-mode --with-profile2=no --with-profile4=no --with-monodroid --enable-nls=no </_CommonConfigureFlags>
10+
<_CommonHostConfigureFlags>$(_CommonConfigureFlags) --with-mcs-docs=no --disable-mono-debugger --disable-iconv --disable-boehm</_CommonHostConfigureFlags>
11+
<_CommonTargetConfigureFlags>$(_CommonConfigureFlags) --with-profile4_x=no --with-sigaltstack=yes --with-tls=pthread mono_cv_uscore=yes</_CommonTargetConfigureFlags>
12+
<_TargetConfigureFlags>$(_CommonTargetConfigureFlags) --enable-minimal=ssa,portability,attach,verifier,full_messages,sgen_remset,sgen_marksweep_par,sgen_marksweep_fixed,sgen_marksweep_fixed_par,sgen_copying,logging,security,shared_handles --disable-mcs-build --disable-executables --disable-iconv --disable-boehm $(_BtlsConfigureFlags)</_TargetConfigureFlags>
1113
<_SecurityCFlags>-fstack-protector</_SecurityCFlags>
1214
<_TargetCFlags>$(_SecurityCFlags) -DMONODROID=1</_TargetCFlags>
1315
<_TargetCxxFlags>$(_SecurityCFlags) -DMONODROID=1</_TargetCxxFlags>

0 commit comments

Comments
 (0)