Unset MSBuildExtensionPath for every msbuild invocation at once, not once per invocation. (#2881)
This commit is contained in:
Родитель
d01376acba
Коммит
da6b8272f0
|
@ -242,7 +242,7 @@ SYSTEM_SN=$(MONO_PREFIX)/bin/sn
|
||||||
SYSTEM_MONO=$(MONO_PREFIX)/bin/mono
|
SYSTEM_MONO=$(MONO_PREFIX)/bin/mono
|
||||||
SYSTEM_MONO32=$(MONO_PREFIX)/bin/mono32
|
SYSTEM_MONO32=$(MONO_PREFIX)/bin/mono32
|
||||||
SYSTEM_XBUILD=$(MONO_PREFIX)/bin/xbuild
|
SYSTEM_XBUILD=$(MONO_PREFIX)/bin/xbuild
|
||||||
SYSTEM_MSBUILD=$(MONO_PREFIX)/bin/msbuild
|
SYSTEM_MSBUILD=unset MSBuildExtensionsPath && $(MONO_PREFIX)/bin/msbuild
|
||||||
SYSTEM_RESGEN=$(MONO_PREFIX)/bin/resgen
|
SYSTEM_RESGEN=$(MONO_PREFIX)/bin/resgen
|
||||||
|
|
||||||
PKG_CONFIG=$(MONO_PREFIX)/bin/pkg-config
|
PKG_CONFIG=$(MONO_PREFIX)/bin/pkg-config
|
||||||
|
|
|
@ -171,7 +171,7 @@ $(TOP)/tools/mtouch/SdkVersions.cs: $(TOP)/tools/common/SdkVersions.cs.in
|
||||||
@touch $@
|
@touch $@
|
||||||
|
|
||||||
xharness/xharness.exe: $(wildcard xharness/*.cs) xharness/xharness.csproj $(TOP)/tools/mtouch/SdkVersions.cs test.config test-system.config .stamp-src-project-files
|
xharness/xharness.exe: $(wildcard xharness/*.cs) xharness/xharness.csproj $(TOP)/tools/mtouch/SdkVersions.cs test.config test-system.config .stamp-src-project-files
|
||||||
$(Q_GEN) unset MSBuildExtensionsPath && $(SYSTEM_MSBUILD) $(MSBUILD_VERBOSITY_QUIET) xharness/xharness.csproj
|
$(Q_GEN) $(SYSTEM_MSBUILD) $(MSBUILD_VERBOSITY_QUIET) xharness/xharness.csproj
|
||||||
|
|
||||||
killall:
|
killall:
|
||||||
@killall "iPhone Simulator" >/dev/null 2>&1 || true
|
@killall "iPhone Simulator" >/dev/null 2>&1 || true
|
||||||
|
|
Загрузка…
Ссылка в новой задаче