diff make/linux/makefiles/build_vm_def.sh @ 1930:2d26b0046e0d

Merge.
author Thomas Wuerthinger <wuerthinger@ssw.jku.at>
date Tue, 30 Nov 2010 14:53:30 +0100
parents 126ea7725993
children a5610f0862fe
line wrap: on
line diff
--- a/make/linux/makefiles/build_vm_def.sh	Mon Nov 29 18:32:30 2010 +0100
+++ b/make/linux/makefiles/build_vm_def.sh	Tue Nov 30 14:53:30 2010 +0100
@@ -1,5 +1,12 @@
 #!/bin/sh
 
-nm --defined-only $* | awk '
+# If we're cross compiling use that path for nm
+if [ "$ALT_COMPILER_PATH" != "" ]; then 
+NM=$ALT_COMPILER_PATH/nm
+else
+NM=nm
+fi
+
+$NM --defined-only $* | awk '
    { if ($3 ~ /^_ZTV/ || $3 ~ /^gHotSpotVM/) print "\t" $3 ";" }
    '