diff options
author | Zoltan Varga <vargaz@gmail.com> | 2017-08-07 15:03:48 +0300 |
---|---|---|
committer | Alexander Köplinger <alex.koeplinger@outlook.com> | 2017-08-07 15:03:48 +0300 |
commit | 33d2d526448c17dd50e171804c614ef16d66e6aa (patch) | |
tree | 17193f3e8b6704bf43cf518430562606365ab9d6 /mcs/class/System.Reactive.Providers | |
parent | c65f48052a483ab8a06ff5839d5e346ac9e39c97 (diff) |
[bcl] Specify the name of the key file on the command line instead of using the AssemblyKeyFile attribute for consistency and to make it easier to do path name manipulation on the file name. (#5316)
Diffstat (limited to 'mcs/class/System.Reactive.Providers')
-rw-r--r-- | mcs/class/System.Reactive.Providers/Makefile | 6 | ||||
-rw-r--r-- | mcs/class/System.Reactive.Providers/more_build_args | 4 |
2 files changed, 3 insertions, 7 deletions
diff --git a/mcs/class/System.Reactive.Providers/Makefile b/mcs/class/System.Reactive.Providers/Makefile index ab1f274d150..019b9ed8e49 100644 --- a/mcs/class/System.Reactive.Providers/Makefile +++ b/mcs/class/System.Reactive.Providers/Makefile @@ -4,8 +4,8 @@ include ../../build/rules.make LIBRARY = System.Reactive.Providers.dll LIB_REFS = System System.Core System.Reactive.Interfaces System.Reactive.Core System.Reactive.Linq -LIB_MCS_FLAGS = \ - @more_build_args +KEYFILE = ../reactive.pub +LIB_MCS_FLAGS = -d:SIGNED -delaysign -resource:Strings_Providers.resources,System.Reactive.Strings_Providers.resources ifeq (true, $(GENERATE_RESOURCES)) LIB_MCS_FLAGS += /define:GENERATING_RESOURCES @@ -31,7 +31,7 @@ endif TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) -EXTRA_DISTFILES = more_build_args $(RESX_RESOURCES:.resources=.resx) $(PREBUILT) +EXTRA_DISTFILES = $(RESX_RESOURCES:.resources=.resx) $(PREBUILT) INSTALL_PROFILE := $(filter net_4_x, $(PROFILE)) ifndef INSTALL_PROFILE diff --git a/mcs/class/System.Reactive.Providers/more_build_args b/mcs/class/System.Reactive.Providers/more_build_args deleted file mode 100644 index 264c0c0aca6..00000000000 --- a/mcs/class/System.Reactive.Providers/more_build_args +++ /dev/null @@ -1,4 +0,0 @@ --d:SIGNED --delaysign --keyfile:../reactive.pub --resource:Strings_Providers.resources,System.Reactive.Strings_Providers.resources |