about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorBrian Anderson <banderson@mozilla.com>2014-02-26 20:13:08 -0800
committerAlex Crichton <alex@alexcrichton.com>2014-04-06 15:55:43 -0700
commit0e85e599dbcd08e2a0c0e1bfa3cf23ed4eb68197 (patch)
tree0f645cd5805994a8e2978ddf33ea9f406a31a303 /src
parenta6173e19d01ec63741334625a98ecca52a289756 (diff)
downloadrust-0e85e599dbcd08e2a0c0e1bfa3cf23ed4eb68197.tar.gz
rust-0e85e599dbcd08e2a0c0e1bfa3cf23ed4eb68197.zip
mk: Pass the name of the make command to maketest.py
This should make BSD use the proper GNU make.
Diffstat (limited to 'src')
-rw-r--r--src/etc/maketest.py15
1 files changed, 8 insertions, 7 deletions
diff --git a/src/etc/maketest.py b/src/etc/maketest.py
index 1e2cdabcb84..9e8bee3abb6 100644
--- a/src/etc/maketest.py
+++ b/src/etc/maketest.py
@@ -17,12 +17,13 @@ if os.name == 'nt':
     print 'ignoring make tests on windows'
     sys.exit(0)
 
-os.putenv('RUSTC', os.path.abspath(sys.argv[2]))
-os.putenv('TMPDIR', os.path.abspath(sys.argv[3]))
-os.putenv('CC', sys.argv[4])
-os.putenv('RUSTDOC', os.path.abspath(sys.argv[5]))
-filt = sys.argv[6]
-ldpath = sys.argv[7]
+make = sys.argv[2]
+os.putenv('RUSTC', os.path.abspath(sys.argv[3]))
+os.putenv('TMPDIR', os.path.abspath(sys.argv[4]))
+os.putenv('CC', sys.argv[5])
+os.putenv('RUSTDOC', os.path.abspath(sys.argv[6]))
+filt = sys.argv[7]
+ldpath = sys.argv[8]
 if ldpath != '':
     os.putenv(ldpath.split('=')[0], ldpath.split('=')[1])
 
@@ -30,7 +31,7 @@ if not filt in sys.argv[1]:
     sys.exit(0)
 print('maketest: ' + os.path.basename(os.path.dirname(sys.argv[1])))
 
-proc = subprocess.Popen(['make', '-C', sys.argv[1]],
+proc = subprocess.Popen([make, '-C', sys.argv[1]],
                         stdout = subprocess.PIPE,
                         stderr = subprocess.PIPE)
 out, err = proc.communicate()