Merge pull request #2720 from mono/fix-39325

[mono.git] / mcs / build / library.make

diff --git a/mcs/build/library.make b/mcs/build/library.make
index 63bf1263681ded8be2172efc791cb99401ccc985..1df98aeea1f035eb5e187138f58761eaccab60be 100644 (file)
--- a/mcs/build/library.make
+++ b/mcs/build/library.make
@@ -8,6 +8,18 @@
 # All the dep files now land in the same directory so we
 # munge in the library name to keep the files from clashing.
 
+# The including makefile can set the following variables:
+# LIB_MCS_FLAGS - Command line flags passed to mcs.
+# LIB_REFS      - This should be a space separated list of assembly names which are added to the mcs
+#                 command line.
+#
+
+# All dependent libs become dependent dirs for parallel builds
+# Have to rename to handle differences between assembly/directory names
+DEP_LIBS=$(patsubst System.Xml,System.XML,$(LIB_REFS))
+
+LIB_MCS_FLAGS += $(patsubst %,-r:%.dll,$(LIB_REFS))
+
 sourcefile = $(LIBRARY).sources
 
 # If the directory contains the per profile include file, generate list file.
@@ -46,7 +58,7 @@ endif
 endif
 
 ifndef response
-response = $(depsdir)/$(PROFILE)_$(LIBRARY).response
+response = $(depsdir)/$(PROFILE)_$(LIBRARY_SUBDIR)_$(LIBRARY).response
 library_CLEAN_FILES += $(response)
 endif
 
@@ -68,7 +80,9 @@ endif
 
 ifdef RESOURCE_STRINGS
 ifdef BOOTSTRAP_PROFILE
-MCS_FLAGS_INTERNAL += $(RESOURCE_STRINGS:%=--getresourcestrings:%)
+ifneq (basic, $(BUILD_TOOLS_PROFILE))
+RESOURCE_STRINGS_FILES += $(RESOURCE_STRINGS:%=--resourcestrings:%)
+endif
 endif
 endif
 
@@ -129,6 +143,7 @@ csproj-local: csproj-library csproj-test
 intermediate_clean=$(subst /,-,$(intermediate))
 csproj-library: 
        config_file=`basename $(LIBRARY) .dll`-$(intermediate_clean)$(PROFILE).input; \
+       case "$(thisdir)" in *"Facades"*) config_file=Facades_$$config_file;; esac; \
        echo $(thisdir):$$config_file >> $(topdir)/../msvc/scripts/order; \
        (echo $(is_boot); \
        echo $(USE_MCS_FLAGS) $(LIBRARY_FLAGS) $(LIB_MCS_FLAGS); \
@@ -269,6 +284,9 @@ $(the_lib): $(the_libdir)/.stamp
 $(build_lib): $(response) $(sn) $(BUILT_SOURCES) $(build_libdir:=/.stamp)
        $(LIBRARY_COMPILE) $(LIBRARY_FLAGS) $(LIB_MCS_FLAGS) -target:library -out:$@ $(BUILT_SOURCES_cmdline) @$(response)
        $(Q) $(SN) -R $@ $(LIBRARY_SNK)
+ifdef RESOURCE_STRINGS_FILES
+       $(Q) $(STRING_REPLACER) $(RESOURCE_STRINGS_FILES) $@
+endif
 
 ifdef LIBRARY_USE_INTERMEDIATE_FILE
 $(the_lib): $(build_lib)
@@ -282,19 +300,15 @@ library_CLEAN_FILES += $(PROFILE)_aot.log
 
 ifdef PLATFORM_AOT_SUFFIX
 Q_AOT=$(if $(V),,@echo "AOT     [$(PROFILE)] $(notdir $(@))";)
-$(the_lib)$(PLATFORM_AOT_SUFFIX): $(the_lib)
-       $(Q_AOT) MONO_PATH='$(the_libdir)' > $(PROFILE)_aot.log 2>&1 $(RUNTIME) --aot=bind-to-runtime-version --debug $(the_lib)
-endif
-
-ifdef ENABLE_AOT
-ifneq (,$(filter $(AOT_IN_PROFILES), $(PROFILE)))
 
-all-local: $(the_lib)$(PLATFORM_AOT_SUFFIX)
+$(the_lib)$(PLATFORM_AOT_SUFFIX): $(the_lib)
+       $(Q_AOT) MONO_PATH='$(the_libdir_base)' > $(PROFILE)_$(LIBRARY_NAME)_aot.log 2>&1 $(RUNTIME) $(AOT_BUILD_FLAGS) --debug $(the_lib)
 
+all-local-aot: $(the_lib)$(PLATFORM_AOT_SUFFIX)
 endif
-endif
 
-makefrag = $(depsdir)/$(PROFILE)_$(LIBRARY).makefrag
+
+makefrag = $(depsdir)/$(PROFILE)_$(LIBRARY_SUBDIR)_$(LIBRARY).makefrag
 library_CLEAN_FILES += $(makefrag)
 $(makefrag): $(sourcefile)
 #      @echo Creating $@ ...
@@ -345,3 +359,6 @@ $(the_libdir)/.doc-stamp: $(the_lib)
        $(MDOC_UP)
        @echo "doc-stamp" > $@
 
+# Need to be here so it comes after the definition of DEP_DIRS/DEP_LIBS
+gen-deps:
+       @echo "$(DEPS_TARGET_DIR): $(DEP_DIRS) $(DEP_LIBS)" >> $(DEPS_FILE)