Avoid module compilation problems by unsetting the environment variable 'ARCH'.

* testsuite/lib/systemtap.exp (setup_systemtap_environment): Make sure the
  environment variable 'ARCH' isn't set. If it is, it can cause custom
  module building to fail.

diff --git a/testsuite/lib/systemtap.exp b/testsuite/lib/systemtap.exp
index 1f91750a75fd599df8720871ac478d86a2bb98af..ba93901f2d95a6941788265ee7b1a21a41d56d1f 100644 (file)
--- a/testsuite/lib/systemtap.exp
+++ b/testsuite/lib/systemtap.exp
@@ -194,6 +194,14 @@ proc setup_systemtap_environment {} {
     # No compile-server started yet.
     set server_pid 0
 
+    # If the environment variable ARCH exists, this can throw off our
+    # custom module building (when set to the wrong value). To be
+    # safe, remove it.
+    if [info exists env(ARCH)] {
+       verbose -log "clearing env ARCH (was $env(ARCH))"
+       unset env(ARCH)
+    }
+
     # PATH, SYSTEMTAP_TAPSET, SYSTEMTAP_RUNTIME, LD_LIBRARY_PATH are already set.
     foreach var {PATH STAP SRCDIR SYSTEMTAP_TAPSET SYSTEMTAP_RUNTIME SYSTEMTAP_DIR LD_LIBRARY_PATH} {
         if [info exists env($var)] {