From ca3f2cdaaf2b19a78aaf86be42d32941fad929d3 Mon Sep 17 00:00:00 2001 From: Katelyn Gadd Date: Tue, 17 Jul 2018 16:19:43 -0700 Subject: [PATCH] Manually specify the search directory for libraries when compiling gensources because it can't find it for some reason --- mcs/build/gensources.make | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) rewrite mcs/build/gensources.make (63%) diff --git a/mcs/build/gensources.make b/mcs/build/gensources.make dissimilarity index 63% index 65c079b926f..82895cedae0 100755 --- a/mcs/build/gensources.make +++ b/mcs/build/gensources.make @@ -1,9 +1,12 @@ -gensources = $(topdir)/build/gensources.exe -$(gensources): $(topdir)/build/gensources.cs - $(BOOTSTRAP_MCS) -noconfig -debug:portable -r:mscorlib.dll -r:System.dll -r:System.Core.dll -out:$(gensources) $(topdir)/build/gensources.cs - -ifdef PROFILE_RUNTIME -GENSOURCES_RUNTIME = $(PROFILE_RUNTIME) -else -GENSOURCES_RUNTIME = MONO_PATH="$(topdir)/class/lib/$(BUILD_TOOLS_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(RUNTIME) -endif \ No newline at end of file +GENSOURCES_LIBDIR = $(topdir)/class/lib/$(BUILD_TOOLS_PROFILE) + +gensources = $(topdir)/build/gensources.exe +$(gensources): $(topdir)/build/gensources.cs + echo $(BOOTSTRAP_MCS) -noconfig -lib:$(GENSOURCES_LIBDIR) -debug:portable -r:mscorlib.dll -r:System.dll -r:System.Core.dll -out:$(gensources) $(topdir)/build/gensources.cs + $(BOOTSTRAP_MCS) -lib:$(GENSOURCES_LIBDIR) -noconfig -debug:portable -r:mscorlib.dll -r:System.dll -r:System.Core.dll -out:$(gensources) $(topdir)/build/gensources.cs + +ifdef PROFILE_RUNTIME +GENSOURCES_RUNTIME = $(PROFILE_RUNTIME) +else +GENSOURCES_RUNTIME = MONO_PATH="$(GENSOURCES_LIBDIR)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(RUNTIME) +endif \ No newline at end of file -- 2.11.4.GIT