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.Observable.Aliases | |
| 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.Observable.Aliases')
| -rw-r--r-- | mcs/class/System.Reactive.Observable.Aliases/Makefile | 6 | ||||
| -rw-r--r-- | mcs/class/System.Reactive.Observable.Aliases/more_build_args | 3 |
2 files changed, 3 insertions, 6 deletions
diff --git a/mcs/class/System.Reactive.Observable.Aliases/Makefile b/mcs/class/System.Reactive.Observable.Aliases/Makefile index 0db9de14052..04c0101248d 100644 --- a/mcs/class/System.Reactive.Observable.Aliases/Makefile +++ b/mcs/class/System.Reactive.Observable.Aliases/Makefile @@ -4,8 +4,8 @@ include ../../build/rules.make LIBRARY = System.Reactive.Observable.Aliases.dll LIB_REFS = System System.Core System.Reactive.Interfaces System.Reactive.Core System.Reactive.Linq System.Reactive.Providers -LIB_MCS_FLAGS = \ - @more_build_args +KEYFILE = ../reactive.pub +LIB_MCS_FLAGS = -d:SIGNED -delaysign ifeq (true, $(GENERATE_RESOURCES)) LIB_MCS_FLAGS += /define:GENERATING_RESOURCES @@ -28,7 +28,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.Observable.Aliases/more_build_args b/mcs/class/System.Reactive.Observable.Aliases/more_build_args deleted file mode 100644 index a53ee7b7f9c..00000000000 --- a/mcs/class/System.Reactive.Observable.Aliases/more_build_args +++ /dev/null @@ -1,3 +0,0 @@ --d:SIGNED --delaysign --keyfile:../reactive.pub |