projects
/
mono.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
5dd2290
)
Revert "[assembly] Add Facades dir to default_path on all runtimes"
author
Aleksey Kliger
<aleksey@xamarin.com>
Wed, 26 Apr 2017 22:30:20 +0000
(18:30 -0400)
committer
Aleksey Kliger
<aleksey@xamarin.com>
Wed, 26 Apr 2017 23:09:47 +0000
(19:09 -0400)
This reverts commit
d7e3698dbc06b268c564cd3a41a50902b01012e4
.
mono/metadata/assembly.c
patch
|
blob
|
history
diff --git
a/mono/metadata/assembly.c
b/mono/metadata/assembly.c
index 7210b012bb7dc2e517a7352277d30e80618cb1f6..ac192cc92a17f38f8343bee6fea40bdac744a355 100644
(file)
--- a/
mono/metadata/assembly.c
+++ b/
mono/metadata/assembly.c
@@
-3533,7
+3533,7
@@
mono_assembly_load_corlib (const MonoRuntimeInfo *runtime, MonoImageOpenStatus *
g_free (corlib_file);
return_corlib_and_facades:
- if (corlib
)
+ if (corlib
&& !strcmp (runtime->framework_version, "4.5")) // FIXME: stop hardcoding 4.5 here
default_path [1] = g_strdup_printf ("%s/Facades", corlib->basedir);
return corlib;