From 2edeeb60e72cea311d6fa5eaf39ca6a4504b0cd4 Mon Sep 17 00:00:00 2001 From: Atsushi Eno Date: Fri, 5 Apr 2013 00:02:29 +0900 Subject: [PATCH] rx: Add -d:HAS_AWAIT options to 4.5 and 2.1 builds. --- mcs/class/System.Reactive.Core/Makefile | 4 ++-- mcs/class/System.Reactive.Debugger/Makefile | 4 ++-- mcs/class/System.Reactive.Experimental/Makefile | 4 ++-- mcs/class/System.Reactive.Interfaces/Makefile | 4 ++-- mcs/class/System.Reactive.Linq/Makefile | 4 ++-- mcs/class/System.Reactive.PlatformServices/Makefile | 4 ++-- mcs/class/System.Reactive.Providers/Makefile | 4 ++-- mcs/class/System.Reactive.Runtime.Remoting/Makefile | 2 +- mcs/class/System.Reactive.Windows.Forms/Makefile | 4 ++-- mcs/class/System.Reactive.Windows.Threading/Makefile | 4 ++-- 10 files changed, 19 insertions(+), 19 deletions(-) diff --git a/mcs/class/System.Reactive.Core/Makefile b/mcs/class/System.Reactive.Core/Makefile index e6395385c1b..d56ecc9c089 100644 --- a/mcs/class/System.Reactive.Core/Makefile +++ b/mcs/class/System.Reactive.Core/Makefile @@ -23,12 +23,12 @@ RESOURCES = $(RESX_RESOURCES) PREBUILT = $(RESX_RESOURCES:=.prebuilt) ifeq (2.1, $(FRAMEWORK_VERSION)) -LIB_MCS_FLAGS += -d:NO_TASK_DELAY +LIB_MCS_FLAGS += -d:NO_TASK_DELAY -d:HAS_AWAIT endif NET_4_5 := $(filter 4.5, $(FRAMEWORK_VERSION)) ifdef NET_4_5 -LIB_MCS_FLAGS += -d:HAS_EDI -d:PREFERASYNC -d:PREFER_ASYNC +LIB_MCS_FLAGS += -d:HAS_EDI -d:PREFERASYNC -d:PREFER_ASYNC -d:HAS_AWAIT endif TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) diff --git a/mcs/class/System.Reactive.Debugger/Makefile b/mcs/class/System.Reactive.Debugger/Makefile index 65d30c049ba..8c6dee9af40 100644 --- a/mcs/class/System.Reactive.Debugger/Makefile +++ b/mcs/class/System.Reactive.Debugger/Makefile @@ -12,12 +12,12 @@ LIB_MCS_FLAGS = \ -r:System.Reactive.Linq.dll ifeq (2.1, $(FRAMEWORK_VERSION)) -LIB_MCS_FLAGS += -d:NO_TASK_DELAY +LIB_MCS_FLAGS += -d:NO_TASK_DELAY -d:HAS_AWAIT endif NET_4_5 := $(filter 4.5, $(FRAMEWORK_VERSION)) ifdef NET_4_5 -LIB_MCS_FLAGS += -d:HAS_EDI -d:PREFERASYNC -d:PREFER_ASYNC +LIB_MCS_FLAGS += -d:HAS_EDI -d:PREFERASYNC -d:PREFER_ASYNC -d:HAS_AWAIT endif TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) diff --git a/mcs/class/System.Reactive.Experimental/Makefile b/mcs/class/System.Reactive.Experimental/Makefile index 966b95daff9..e7b128f3813 100644 --- a/mcs/class/System.Reactive.Experimental/Makefile +++ b/mcs/class/System.Reactive.Experimental/Makefile @@ -12,12 +12,12 @@ LIB_MCS_FLAGS = \ -r:System.Reactive.Linq.dll ifeq (2.1, $(FRAMEWORK_VERSION)) -LIB_MCS_FLAGS += -d:NO_TASK_DELAY +LIB_MCS_FLAGS += -d:NO_TASK_DELAY -d:HAS_AWAIT endif NET_4_5 := $(filter 4.5, $(FRAMEWORK_VERSION)) ifdef NET_4_5 -LIB_MCS_FLAGS += -d:HAS_EDI -d:PREFERASYNC -d:PREFER_ASYNC +LIB_MCS_FLAGS += -d:HAS_EDI -d:PREFERASYNC -d:PREFER_ASYNC -d:HAS_AWAIT endif TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) diff --git a/mcs/class/System.Reactive.Interfaces/Makefile b/mcs/class/System.Reactive.Interfaces/Makefile index b001529523d..967a34327de 100644 --- a/mcs/class/System.Reactive.Interfaces/Makefile +++ b/mcs/class/System.Reactive.Interfaces/Makefile @@ -9,12 +9,12 @@ LIB_MCS_FLAGS = \ -r:System.Core.dll ifeq (2.1, $(FRAMEWORK_VERSION)) -LIB_MCS_FLAGS += -d:NO_TASK_DELAY +LIB_MCS_FLAGS += -d:NO_TASK_DELAY -d:HAS_AWAIT endif NET_4_5 := $(filter 4.5, $(FRAMEWORK_VERSION)) ifdef NET_4_5 -LIB_MCS_FLAGS += -d:HAS_EDI -d:PREFERASYNC -d:PREFER_ASYNC +LIB_MCS_FLAGS += -d:HAS_EDI -d:PREFERASYNC -d:PREFER_ASYNC -d:HAS_AWAIT endif TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) diff --git a/mcs/class/System.Reactive.Linq/Makefile b/mcs/class/System.Reactive.Linq/Makefile index 690aa82dbc5..3afa5560431 100644 --- a/mcs/class/System.Reactive.Linq/Makefile +++ b/mcs/class/System.Reactive.Linq/Makefile @@ -24,12 +24,12 @@ RESOURCES = $(RESX_RESOURCES) PREBUILT = $(RESX_RESOURCES:=.prebuilt) ifeq (2.1, $(FRAMEWORK_VERSION)) -LIB_MCS_FLAGS += -d:NO_TASK_DELAY +LIB_MCS_FLAGS += -d:NO_TASK_DELAY -d:HAS_AWAIT endif NET_4_5 := $(filter 4.5, $(FRAMEWORK_VERSION)) ifdef NET_4_5 -LIB_MCS_FLAGS += -d:HAS_EDI -d:PREFERASYNC -d:PREFER_ASYNC +LIB_MCS_FLAGS += -d:HAS_EDI -d:PREFERASYNC -d:PREFER_ASYNC -d:HAS_AWAIT endif TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) diff --git a/mcs/class/System.Reactive.PlatformServices/Makefile b/mcs/class/System.Reactive.PlatformServices/Makefile index e8b78f2d3bb..80e88566ca6 100644 --- a/mcs/class/System.Reactive.PlatformServices/Makefile +++ b/mcs/class/System.Reactive.PlatformServices/Makefile @@ -25,12 +25,12 @@ RESOURCES = $(RESX_RESOURCES) PREBUILT = $(RESX_RESOURCES:=.prebuilt) ifeq (2.1, $(FRAMEWORK_VERSION)) -LIB_MCS_FLAGS += -d:NO_TASK_DELAY +LIB_MCS_FLAGS += -d:NO_TASK_DELAY -d:HAS_AWAIT endif NET_4_5 := $(filter 4.5, $(FRAMEWORK_VERSION)) ifdef NET_4_5 -LIB_MCS_FLAGS += -d:HAS_EDI -d:PREFERASYNC -d:PREFER_ASYNC +LIB_MCS_FLAGS += -d:HAS_EDI -d:PREFERASYNC -d:PREFER_ASYNC -d:HAS_AWAIT endif NO_TASK_DELAY := $(filter 4.5 2.1, $(FRAMEWORK_VERSION)) diff --git a/mcs/class/System.Reactive.Providers/Makefile b/mcs/class/System.Reactive.Providers/Makefile index 44088a17101..06ec402a0df 100644 --- a/mcs/class/System.Reactive.Providers/Makefile +++ b/mcs/class/System.Reactive.Providers/Makefile @@ -25,12 +25,12 @@ RESOURCES = $(RESX_RESOURCES) PREBUILT = $(RESX_RESOURCES:=.prebuilt) ifeq (2.1, $(FRAMEWORK_VERSION)) -LIB_MCS_FLAGS += -d:NO_TASK_DELAY +LIB_MCS_FLAGS += -d:NO_TASK_DELAY -d:HAS_AWAIT endif NET_4_5 := $(filter 4.5, $(FRAMEWORK_VERSION)) ifdef NET_4_5 -LIB_MCS_FLAGS += -d:HAS_EDI -d:PREFERASYNC -d:PREFER_ASYNC +LIB_MCS_FLAGS += -d:HAS_EDI -d:PREFERASYNC -d:PREFER_ASYNC -d:HAS_AWAIT endif TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) diff --git a/mcs/class/System.Reactive.Runtime.Remoting/Makefile b/mcs/class/System.Reactive.Runtime.Remoting/Makefile index deaf483c327..e5fbf287ad2 100644 --- a/mcs/class/System.Reactive.Runtime.Remoting/Makefile +++ b/mcs/class/System.Reactive.Runtime.Remoting/Makefile @@ -17,7 +17,7 @@ endif NET_4_5 := $(filter 4.5, $(FRAMEWORK_VERSION)) ifdef NET_4_5 -LIB_MCS_FLAGS += -d:HAS_EDI -d:PREFERASYNC -d:PREFER_ASYNC +LIB_MCS_FLAGS += -d:HAS_EDI -d:PREFERASYNC -d:PREFER_ASYNC -d:HAS_AWAIT endif TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) diff --git a/mcs/class/System.Reactive.Windows.Forms/Makefile b/mcs/class/System.Reactive.Windows.Forms/Makefile index 63b3fe0f4a5..bc427b92a19 100644 --- a/mcs/class/System.Reactive.Windows.Forms/Makefile +++ b/mcs/class/System.Reactive.Windows.Forms/Makefile @@ -13,12 +13,12 @@ LIB_MCS_FLAGS = \ -r:System.Windows.Forms.dll ifeq (2.1, $(FRAMEWORK_VERSION)) -LIB_MCS_FLAGS += -d:NO_TASK_DELAY +LIB_MCS_FLAGS += -d:NO_TASK_DELAY -d:HAS_AWAIT endif NET_4_5 := $(filter 4.5, $(FRAMEWORK_VERSION)) ifdef NET_4_5 -LIB_MCS_FLAGS += -d:HAS_EDI -d:PREFERASYNC -d:PREFER_ASYNC +LIB_MCS_FLAGS += -d:HAS_EDI -d:PREFERASYNC -d:PREFER_ASYNC -d:HAS_AWAIT endif TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) diff --git a/mcs/class/System.Reactive.Windows.Threading/Makefile b/mcs/class/System.Reactive.Windows.Threading/Makefile index 8e1641a8cb5..dd68cd5a03b 100644 --- a/mcs/class/System.Reactive.Windows.Threading/Makefile +++ b/mcs/class/System.Reactive.Windows.Threading/Makefile @@ -26,12 +26,12 @@ RESOURCES = $(RESX_RESOURCES) PREBUILT = $(RESX_RESOURCES:=.prebuilt) ifeq (2.1, $(FRAMEWORK_VERSION)) -LIB_MCS_FLAGS += -d:NO_TASK_DELAY +LIB_MCS_FLAGS += -d:NO_TASK_DELAY -d:HAS_AWAIT endif NET_4_5 := $(filter 4.5, $(FRAMEWORK_VERSION)) ifdef NET_4_5 -LIB_MCS_FLAGS += -d:HAS_EDI -d:PREFERASYNC -d:PREFER_ASYNC +LIB_MCS_FLAGS += -d:HAS_EDI -d:PREFERASYNC -d:PREFER_ASYNC -d:HAS_AWAIT endif TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) -- 2.11.4.GIT