diff options
| author | Alexander Köplinger <alex.koeplinger@outlook.com> | 2019-08-07 21:17:08 +0300 |
|---|---|---|
| committer | Alexander Köplinger <alex.koeplinger@outlook.com> | 2019-08-09 13:53:14 +0300 |
| commit | 3e77e0107172081523907f6f8a62599cdc18bd20 (patch) | |
| tree | 51d3e38078373da4b4d3c3e397343d18ce74b52b /mcs/build | |
| parent | 175e345122b7a65d178608187416706eba75e97b (diff) | |
[build] Replace PLATFORM_ ifdefs with HOST_PLATFORM checks
Building Linux BCL assemblies from a macOS machine didn't work since we
were enabling some Apple features if the build machine was macOS.
Diffstat (limited to 'mcs/build')
| -rw-r--r-- | mcs/build/platforms/linux.make | 2 | ||||
| -rw-r--r-- | mcs/build/platforms/macos.make | 2 | ||||
| -rw-r--r-- | mcs/build/platforms/unix.make | 3 | ||||
| -rw-r--r-- | mcs/build/platforms/win32.make | 1 | ||||
| -rw-r--r-- | mcs/build/profiles/monodroid.make | 2 | ||||
| -rw-r--r-- | mcs/build/profiles/net_4_x.make | 2 |
6 files changed, 2 insertions, 10 deletions
diff --git a/mcs/build/platforms/linux.make b/mcs/build/platforms/linux.make index 647c782b35f..02348318afe 100644 --- a/mcs/build/platforms/linux.make +++ b/mcs/build/platforms/linux.make @@ -34,5 +34,3 @@ platform-check: # echo "*** You need to build MCS with GNU make. Try \`gmake'" ; \ # exit 1 ; \ # fi - -PLATFORM_LINUX=1 diff --git a/mcs/build/platforms/macos.make b/mcs/build/platforms/macos.make index 0b272b8b1d2..65c991996b3 100644 --- a/mcs/build/platforms/macos.make +++ b/mcs/build/platforms/macos.make @@ -34,5 +34,3 @@ platform-check: # echo "*** You need to build MCS with GNU make. Try \`gmake'" ; \ # exit 1 ; \ # fi - -PLATFORM_MACOS=1 diff --git a/mcs/build/platforms/unix.make b/mcs/build/platforms/unix.make index bcd84055090..f73d80f0ee0 100644 --- a/mcs/build/platforms/unix.make +++ b/mcs/build/platforms/unix.make @@ -34,6 +34,3 @@ platform-check: # echo "*** You need to build MCS with GNU make. Try \`gmake'" ; \ # exit 1 ; \ # fi - - -PLATFORM_UNIX=1 diff --git a/mcs/build/platforms/win32.make b/mcs/build/platforms/win32.make index 9d920a3bf9b..7991dc78167 100644 --- a/mcs/build/platforms/win32.make +++ b/mcs/build/platforms/win32.make @@ -31,4 +31,3 @@ hidden_suffix = .tmp platform-check: @: -PLATFORM_WIN32=1 diff --git a/mcs/build/profiles/monodroid.make b/mcs/build/profiles/monodroid.make index 4712759d195..641eb280737 100644 --- a/mcs/build/profiles/monodroid.make +++ b/mcs/build/profiles/monodroid.make @@ -35,7 +35,7 @@ MOBILE_DYNAMIC = yes MOBILE_PROFILE = yes NO_CONSOLE = yes -ifdef PLATFORM_WIN32 +ifeq ($(HOST_PLATFORM),win32) PROFILE_MCS_FLAGS += -d:MOBILE_DESKTOP_HOST -d:WIN_PLATFORM endif diff --git a/mcs/build/profiles/net_4_x.make b/mcs/build/profiles/net_4_x.make index 16f8eb528d9..c103edc4223 100644 --- a/mcs/build/profiles/net_4_x.make +++ b/mcs/build/profiles/net_4_x.make @@ -21,7 +21,7 @@ XBUILD_VERSION = 4.0 ENFORCE_LIBRARY_WARN_AS_ERROR = yes -ifdef PLATFORM_MACOS +ifeq ($(HOST_PLATFORM),macos) MONO_FEATURE_APPLETLS=1 ENABLE_GSS=1 endif |