]> xenbits.xensource.com Git - people/iwj/osstest.git/commitdiff
rumprun: ts-rumprun-build: Adjust command prefixes for new rumprun
authorIan Jackson <ian.jackson@eu.citrix.com>
Wed, 25 May 2016 15:46:04 +0000 (16:46 +0100)
committerIan Jackson <Ian.Jackson@eu.citrix.com>
Mon, 5 Sep 2016 14:03:20 +0000 (15:03 +0100)
Nowadays the expected use pattern is
   CC=<...rumprun...>-gcc ./configure
etc.

Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
ts-rumprun-build

index 93c34d192a227408b70c23f4aad600c94905c614..cb91d5c20e9e940b256d382d1f8c87ddae311749 100755 (executable)
@@ -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() {