Make mkbundle use SDKs instead of a single runtime for cross compilation

[mono.git] / mono / metadata / assembly.c

diff --git a/mono/metadata/assembly.c b/mono/metadata/assembly.c
index b7dc085524205db8e3cf38758ea005bdab90f1b0..209e4ab4f988192fe280953fe7d5017c547d56b3 100644 (file)
--- a/mono/metadata/assembly.c
+++ b/mono/metadata/assembly.c
@@ -570,7 +570,7 @@ mono_assembly_getrootdir (void)
  * Returns: a string with the directory, this string should be freed by
  * the caller.
  */
-G_CONST_RETURN gchar *
+gchar *
 mono_native_getrootdir (void)
 {
        gchar* fullpath = g_build_path (G_DIR_SEPARATOR_S, mono_assembly_getrootdir (), mono_config_get_reloc_lib_dir(), NULL);
@@ -1842,6 +1842,12 @@ mono_assembly_has_reference_assembly_attribute (MonoAssembly *assembly, MonoErro
 {
        mono_error_init (error);
 
+/* TODO: mono_custom_attrs_from_assembly_checked returns NULL if a
+ * single assembly is missing.  The custom attr we want is from
+ * corlib, however, so we need a more robust version that doesn't care
+ * about missing attributes.
+ */
+#if 0
        MonoCustomAttrInfo *attrs = mono_custom_attrs_from_assembly_checked (assembly, error);
        return_val_if_nok (error, FALSE);
        if (!attrs)
@@ -1851,6 +1857,9 @@ mono_assembly_has_reference_assembly_attribute (MonoAssembly *assembly, MonoErro
        gboolean result = mono_custom_attrs_has_attr (attrs, ref_asm_class);
        mono_custom_attrs_free (attrs);
        return result;
+#else
+       return FALSE;
+#endif
 }
 
 /**