diff options
| author | Andi McClure <andi.mcclure@xamarin.com> | 2017-03-21 00:25:18 +0300 |
|---|---|---|
| committer | Andi McClure <andi.mcclure@xamarin.com> | 2017-03-31 00:57:00 +0300 |
| commit | 2ffb9a35a746a57d77d8a6d5bf504ec64e55b231 (patch) | |
| tree | d1f3198b5d0275fc832f88225c7ed5b6c61d5a33 /mcs/class/Makefile | |
| parent | 7a04c99af19ed8975aa36f8c5416ca421a16f2bd (diff) | |
Combined cherrypick of changes between mono-4.8.0-branch and orbis-branch-30
ORBIS #ifdefs in BCL, exclude several files and assembly directories
from the orbis build, HAVE_LOCALTIME_R define in C.
Diffstat (limited to 'mcs/class/Makefile')
| -rw-r--r-- | mcs/class/Makefile | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/mcs/class/Makefile b/mcs/class/Makefile index 3f981f77aba..964c683620e 100644 --- a/mcs/class/Makefile +++ b/mcs/class/Makefile @@ -335,6 +335,11 @@ xbuild_4_0_dirs := \ $(xbuild_2_0_dirs) \ Microsoft.Build +orbis_exclude_dirs := \ + Microsoft.CSharp \ + Mono.CSharp \ + Mono.Data.Sqlite + monodroid_SUBDIRS := $(monodroid_dirs) monotouch_SUBDIRS := $(monotouch_dirs) monotouch_watch_SUBDIRS := $(monotouch_watch_dirs) @@ -352,7 +357,7 @@ net_4_x_PARALLEL_SUBDIRS := $(net_4_x_parallel_dirs) xbuild_12_SUBDIRS := $(xbuild_4_0_dirs) xbuild_14_SUBDIRS := $(xbuild_4_0_dirs) Microsoft.NuGet.Build.Tasks winaot_SUBDIRS := $(winaot_dirs) -orbis_SUBDIRS := $(monotouch_dirs) +orbis_SUBDIRS := $(filter-out $(orbis_exclude_dirs),$(monotouch_dirs)) include ../build/rules.make |