From 3a665c6e2f64099b2a8752d6ac3fa1b1d282a35b Mon Sep 17 00:00:00 2001 From: rdb Date: Sun, 27 Jan 2013 22:01:35 +0000 Subject: [PATCH] Locate interrogate_module correctly when cross-compiling --- makepanda/makepanda.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/makepanda/makepanda.py b/makepanda/makepanda.py index 56720ca314..131e50ddb3 100755 --- a/makepanda/makepanda.py +++ b/makepanda/makepanda.py @@ -1202,7 +1202,13 @@ def CompileImod(wobj, wsrc, opts): WriteFile(woutc,"") CompileCxx(wobj,woutc,opts) return - cmd = GetOutputDir() + '/bin/interrogate_module ' + + if not CrossCompiling(): + # If we're compiling for this platform, we can use the one we've built. + cmd = os.path.join(GetOutputDir(), 'bin', 'interrogate_module') + else: + cmd = 'interrogate_module' + cmd += ' -oc ' + woutc + ' -module ' + module + ' -library ' + library + ' -python-native ' for x in wsrc: cmd += ' ' + BracketNameWithQuotes(x) oscmd(cmd)