1*4882a593SmuzhiyunFrom 85307f592c7cb87af162cca4b121b874108b7754 Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Alistair Francis <alistair.francis@wdc.com> 3*4882a593SmuzhiyunDate: Tue, 2 Apr 2019 11:25:15 -0700 4*4882a593SmuzhiyunSubject: [PATCH] setup.py: Don't hardcode swig and fann2 binary locations 5*4882a593Smuzhiyun 6*4882a593SmuzhiyunUpstream-Status: Inappropriate [configuration] 7*4882a593SmuzhiyunSigned-off-by: Alistair Francis <alistair.francis@wdc.com> 8*4882a593Smuzhiyun--- 9*4882a593Smuzhiyun setup.py | 5 +---- 10*4882a593Smuzhiyun 1 file changed, 1 insertion(+), 4 deletions(-) 11*4882a593Smuzhiyun 12*4882a593Smuzhiyundiff --git a/setup.py b/setup.py 13*4882a593Smuzhiyunindex 37af7c7..8e416f2 100755 14*4882a593Smuzhiyun--- a/setup.py 15*4882a593Smuzhiyun+++ b/setup.py 16*4882a593Smuzhiyun@@ -81,11 +81,8 @@ def find_swig(): 17*4882a593Smuzhiyun 18*4882a593Smuzhiyun def build_swig(): 19*4882a593Smuzhiyun '''Run SWIG with specified parameters''' 20*4882a593Smuzhiyun- print("Looking for FANN libs...") 21*4882a593Smuzhiyun- find_fann() 22*4882a593Smuzhiyun- print("running SWIG...") 23*4882a593Smuzhiyun swig_bin = find_swig() 24*4882a593Smuzhiyun- swig_cmd = [swig_bin, '-c++', '-python', 'fann2/fann2.i'] 25*4882a593Smuzhiyun+ swig_cmd = ['swig', '-c++', '-python', 'fann2/fann2.i'] 26*4882a593Smuzhiyun subprocess.Popen(swig_cmd).wait() 27*4882a593Smuzhiyun 28*4882a593Smuzhiyun if "sdist" not in sys.argv: 29