From 010fcfb9ecfef1654b415dbb909a01148a89e827 Mon Sep 17 00:00:00 2001
From: Zoltan Varga <vargaz@gmail.com>
Date: Fri, 2 Jun 2017 03:51:44 -0400
Subject: [runtime] Remove all NACL support. It was unmaintained for a long
 time. (#4955)

https://blog.chromium.org/2017/05/goodbye-pnacl-hello-webassembly.html
---
 runtime/Makefile.am     | 4 ----
 runtime/mono-wrapper.in | 9 ---------
 2 files changed, 13 deletions(-)

(limited to 'runtime')

diff --git a/runtime/Makefile.am b/runtime/Makefile.am
index ae87dfa88c3..052a45eeaeb 100644
--- a/runtime/Makefile.am
+++ b/runtime/Makefile.am
@@ -167,12 +167,8 @@ mcs-compileall: mono-wrapper etc/mono/config
 	if [ "$$ok" = "false" ]; then echo "<?xml version='1.0' encoding='utf-8'?><test-results failures='1' total='1' not-run='0' name='verify' date='$$(date +%F)' time='$$(date +%T)'><test-suite name='mcs-compileall' success='False' time='0'><results><test-case name='fail' executed='True' success='False' time='0'><failure><message>Verifying framework assemblies failed. Check the log for more details.</message><stack-trace></stack-trace></failure></test-case></results></test-suite></test-results>" > TestResult-verify.xml; fi; \
 	$$ok
 
-if NACL_CODEGEN
-check-local:
-else
 check-local: mcs-compileall mcs-do-test-profiles
 	$(MAKE) mcs-do-run-test-profiles
-endif
 
 # Compile all mcs tests
 test: mcs-do-test-profiles
diff --git a/runtime/mono-wrapper.in b/runtime/mono-wrapper.in
index 7c2822f4b99..33ff88d6f21 100644
--- a/runtime/mono-wrapper.in
+++ b/runtime/mono-wrapper.in
@@ -4,13 +4,4 @@ MONO_CFG_DIR='@mono_cfg_dir@'
 PATH="$r/runtime/_tmpinst/bin:$PATH"
 MONO_EXECUTABLE=${MONO_EXECUTABLE:-"$r/@mono_runtime@"}
 export MONO_CFG_DIR PATH
-if [ -n "@nacl_self_host@" ]; then
-  case "$@" in
-    # gacutil.exe and mdoc.exe require filesystem functionality not
-    # exposed in NaCl.
-    # mcs.exe was added to the list recently because mcs under NaCl
-    # no longer produces equivalent output. TODO: investigate
-    */mcs.exe* | */gacutil.exe* | */mdoc.exe* ) exec /usr/local/bin/mono "$@";;
-  esac
-fi
 exec "$r/libtool" --mode=execute "${MONO_EXECUTABLE}" --config "@mono_cfg_dir@/mono/config" "$@"
-- 
cgit v1.2.3