diff mbox

[OSSTEST,09/26] rumprun: ts-rumprun-build: Adjust command prefixes for new rumprun

Message ID 1473084154-396-10-git-send-email-ian.jackson@eu.citrix.com (mailing list archive)
State New, archived
Headers show

Commit Message

Ian Jackson Sept. 5, 2016, 2:02 p.m. UTC 
Nowadays the expected use pattern is
   CC=<...rumprun...>-gcc ./configure
etc.

Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
---
 ts-rumprun-build | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)
diff mbox

Patch

diff --git a/ts-rumprun-build b/ts-rumprun-build
index 93c34d1..cb91d5c 100755
--- a/ts-rumprun-build
+++ b/ts-rumprun-build
@@ -53,14 +53,12 @@  END
 }
 
 sub recordtools() {
-    foreach my $stem (qw(rumprun-xen rumpxen-app)) {
-	my $apptool = "$rux/app-tools/$stem";
-	next unless target_file_exists($ho, "$apptool-configure");
-	store_runvar('cmdprefix_configure', "$apptool-configure");
-	store_runvar('cmdprefix_make',      "$apptool-make");
-	return;
-    }
-    die "app-tools not found ($rux)";
+    my $gcc = target_cmd_output($ho, "echo $rux/bin/*-gcc");
+    chomp $gcc;
+    die "$gcc ?" if $gcc =~ m/\S/;
+    my $prefix = "CC=$gcc ";
+    store_runvar('cmdprefix_configure', $prefix);
+    store_runvar('cmdprefix_make',      $prefix);
 }
 
 sub install() {