[runtime] Remove definitions of MONO_SHARED_DIR from scripts, its not…

… needed anymore.
mikkeljohnsen · Feb 25, 2015 · 0bab8ed · 0bab8ed
1 parent 9e79098
commit 0bab8ed
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 12 deletions.
diff --git a/mono/tests/Makefile.am b/mono/tests/Makefile.am
@@ -13,8 +13,8 @@ TEST_PROG = ../interpreter/mint
 
 JITTEST_PROG = $(if $(VALGRIND), valgrind $(VALGRIND_ARGS),) $(if $(SGEN),$(top_builddir)/mono/mini/mono-sgen,$(top_builddir)/mono/mini/mono)
 
-TEST_PROG_RUN = MONO_SHARED_DIR=$(mono_build_root)/runtime MONO_CFG_DIR=$(mono_build_root)/runtime/etc $(LIBTOOL) --mode=execute $(TEST_PROG)
-JITTEST_PROG_RUN = MONO_SHARED_DIR=$(mono_build_root)/runtime MONO_CFG_DIR=$(mono_build_root)/runtime/etc $(LIBTOOL) --mode=execute $(JITTEST_PROG)
+TEST_PROG_RUN = MONO_CFG_DIR=$(mono_build_root)/runtime/etc $(LIBTOOL) --mode=execute $(TEST_PROG)
+JITTEST_PROG_RUN = MONO_CFG_DIR=$(mono_build_root)/runtime/etc $(LIBTOOL) --mode=execute $(JITTEST_PROG)
 
 RUNTIME_ARGS=--config tests-config --optimize=all --debug
 
@@ -883,7 +883,7 @@ stresstest: $(STRESS_TESTS)
 testbundle: console.exe
 	@echo "Testing mkbundle..."
 	@$(MKBUNDLE) --static console.exe > mkbundle.stdout
-	@$(with_mono_path) MONO_CFG_DIR=$(mono_cfg_dir) MONO_SHARED_DIR=$(mono_build_root)/runtime ./a.out >> mkbundle.stdout
+	@$(with_mono_path) MONO_CFG_DIR=$(mono_cfg_dir) ./a.out >> mkbundle.stdout
 	@- rm -rf a.out
 
 EXTRA_DIST += load-missing.il t-missing.cs load-exceptions.cs

diff --git a/mono/tests/exiting/Makefile b/mono/tests/exiting/Makefile
@@ -7,8 +7,8 @@ srcdir = .
 TEST_PROG = ../../interpreter/mint
 JITTEST_PROG = ../../mini/mono
 
-TEST_PROG_RUN = MONO_PATH=$(mcs_topdir)/class/lib/default MONO_SHARED_DIR=$(mono_build_root)/runtime $(TEST_PROG)
-JITTEST_PROG_RUN = MONO_PATH=$(mcs_topdir)/class/lib/default MONO_SHARED_DIR=$(mono_build_root)/runtime $(JITTEST_PROG)
+TEST_PROG_RUN = MONO_PATH=$(mcs_topdir)/class/lib/default $(TEST_PROG)
+JITTEST_PROG_RUN = MONO_PATH=$(mcs_topdir)/class/lib/default $(JITTEST_PROG)
 
 RUNTIME_ARGS=--config tests-config --optimize=all
 

diff --git a/runtime/Makefile.am b/runtime/Makefile.am
@@ -79,11 +79,9 @@ install-data:
 uninstall:
 	cd $(mcs_topdir) && $(MAKE) NO_DIR_CHECK=1 PROFILES='$(build_profiles)' RUNTIME_HAS_CONSISTENT_GACDIR=yes prefix=$(prefix) uninstall-profiles
 
-## mono --wapi=semdel will probably not delete the semaphore if someone is crazy enough to do a 'make -j distclean' :-)
 clean-local:
 	cd $(mcs_topdir) && $(MAKE) NO_DIR_CHECK=1 PROFILES='$(build_profiles)' clean-profiles
-	-./mono-wrapper --wapi=semdel
-	-rm -fr $(etctmp) $(tmpinst) .wapi
+	-rm -fr $(etctmp) $(tmpinst)
 
 endif BUILD_MCS
 

diff --git a/runtime/mono-wrapper.in b/runtime/mono-wrapper.in
@@ -2,8 +2,7 @@
 r='@mono_build_root@'
 MONO_CFG_DIR='@mono_cfg_dir@'
 PATH="$r/runtime/_tmpinst/bin:$PATH"
-MONO_SHARED_DIR=$r/runtime
-export MONO_CFG_DIR MONO_SHARED_DIR PATH
+export MONO_CFG_DIR PATH
 if [ -n "@nacl_self_host@" ]; then
   case "$@" in
     # gacutil.exe and mdoc.exe require filesystem functionality not

diff --git a/runtime/monodis-wrapper.in b/runtime/monodis-wrapper.in
@@ -1,6 +1,5 @@
 #! /bin/sh
 r='@mono_build_root@'
 MONO_CFG_DIR='@mono_cfg_dir@'
-MONO_SHARED_DIR=$r/runtime
-export MONO_CFG_DIR MONO_SHARED_DIR
+export MONO_CFG_DIR
 exec "$r/libtool" --mode=execute -dlopen "$r/mono/mini/libmono-2.0.la" "$r/mono/dis/monodis" "$@"