diff options
| author | Marek Safar <marek.safar@gmail.com> | 2018-03-05 20:22:48 +0300 |
|---|---|---|
| committer | Marek Safar <marek.safar@gmail.com> | 2018-03-08 00:48:05 +0300 |
| commit | e6de24c2d196b064e64aeea6e45350e985a1bb23 (patch) | |
| tree | b97ca2244bffca1149881eccfa267a466032e3a6 /mcs/build/executable.make | |
| parent | 73859e3df2867ad8bfbff92e37a2b355518e9f7a (diff) | |
[build] Unify DEFAULT_REFERENCE handling so I can override it with TARGET_NET_REFERENCE for individual tools
Diffstat (limited to 'mcs/build/executable.make')
| -rw-r--r-- | mcs/build/executable.make | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/mcs/build/executable.make b/mcs/build/executable.make index 7ac941ca839..5a39dd9501a 100644 --- a/mcs/build/executable.make +++ b/mcs/build/executable.make @@ -42,15 +42,17 @@ executable_CLEAN_FILES += $(build_lib) $(build_lib).so $(build_lib).mdb $(build_ makefrag = $(depsdir)/$(PROFILE)_$(base_prog).makefrag +LIB_REFS_ALL = $(DEFAULT_REFERENCES) $(LIB_REFS) + ifdef TARGET_NET_REFERENCE -# System.*.dll references come from the TARGET_NET_REFERENCE dir, others from the profile dir -LIB_REFS_MONO = $(call _FILTER_OUT,System,$(LIB_REFS)) -LIB_REFS_SYSTEM = $(filter-out $(LIB_REFS_MONO),$(LIB_REFS)) +# System*, mscorlib references come from the TARGET_NET_REFERENCE dir, others from the profile dir +LIB_REFS_MONO = $(call _FILTER_OUT,System,$(call _FILTER_OUT,mscorlib,$(LIB_REFS_ALL))) +LIB_REFS_SYSTEM = $(filter-out $(LIB_REFS_MONO),$(LIB_REFS_ALL)) MCS_REFERENCES = $(patsubst %,-r:$(topdir)/../external/binary-reference-assemblies/$(TARGET_NET_REFERENCE)/%.dll,$(LIB_REFS_SYSTEM)) MCS_REFERENCES += $(patsubst %,-r:$(topdir)/class/lib/$(PROFILE_DIRECTORY)/%.dll,$(LIB_REFS_MONO)) else -MCS_REFERENCES = $(patsubst %,-r:$(topdir)/class/lib/$(PROFILE_DIRECTORY)/%.dll,$(LIB_REFS)) +MCS_REFERENCES = $(patsubst %,-r:$(topdir)/class/lib/$(PROFILE_DIRECTORY)/%.dll,$(LIB_REFS_ALL)) endif ifdef KEYFILE |