summaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authormidipix <writeonce@midipix.org>2018-06-27 22:02:16 -0400
committermidipix <writeonce@midipix.org>2018-06-29 01:37:42 -0400
commit56f2d481b982935757931859339c94dfe062815a (patch)
tree2a0cc19b70686b413cc80c828891c0446c3be0c2 /src
parentdb27ddd5fe0145b89339693fa0100752184276f0 (diff)
downloadslibtool-56f2d481b982935757931859339c94dfe062815a.tar.bz2
slibtool-56f2d481b982935757931859339c94dfe062815a.tar.xz
driver: slbt_init_host_params(): propagate failure of <compiler> -dumpmachine.
Diffstat (limited to 'src')
-rw-r--r--src/driver/slbt_driver_ctx.c28
1 files changed, 21 insertions, 7 deletions
diff --git a/src/driver/slbt_driver_ctx.c b/src/driver/slbt_driver_ctx.c
index d4e60d8..cde2784 100644
--- a/src/driver/slbt_driver_ctx.c
+++ b/src/driver/slbt_driver_ctx.c
@@ -416,6 +416,7 @@ static void slbt_get_host_quad(
}
static int slbt_init_host_params(
+ const struct slbt_driver_ctx * dctx,
const struct slbt_common_ctx * cctx,
struct slbt_host_strs * drvhost,
struct slbt_host_params * host,
@@ -458,10 +459,12 @@ static int slbt_init_host_params(
if (host->host) {
cfgmeta->host = cfgexplicit;
fhost = true;
+
} else if (cctx->target) {
host->host = cctx->target;
cfgmeta->host = cfgtarget;
ftarget = true;
+
} else if (strrchr(base,'-')) {
if (!(drvhost->host = strdup(cctx->cargv[0])))
return -1;
@@ -471,9 +474,22 @@ static int slbt_init_host_params(
host->host = drvhost->host;
cfgmeta->host = cfgcompiler;
fcompiler = true;
- } else if (fdumpmachine && !(slbt_dump_machine(
- cctx->cargv[0],
- buf,sizeof(buf)))) {
+
+ } else if (!fdumpmachine) {
+ host->host = drvhost->machine;
+ cfgmeta->host = cfgnmachine;
+ fnative = true;
+
+ } else if (slbt_dump_machine(cctx->cargv[0],buf,sizeof(buf)) < 0) {
+ if (dctx)
+ slbt_dprintf(
+ slbt_driver_fderr(dctx),
+ "%s: could not determine host "
+ "via -dumpmachine\n",
+ dctx->program);
+ return -1;
+
+ } else {
if (!(drvhost->host = strdup(buf)))
return -1;
@@ -494,10 +510,6 @@ static int slbt_init_host_params(
&& !strcmp(hostquad[1],machinequad[1])
&& !strcmp(hostquad[2],machinequad[2]);
}
- } else {
- host->host = drvhost->machine;
- cfgmeta->host = cfgnmachine;
- fnative = true;
}
/* flavor */
@@ -1233,6 +1245,7 @@ int slbt_get_driver_ctx(
} else {
if (slbt_init_host_params(
+ &ctx->ctx,
&ctx->cctx,
&ctx->host,
&ctx->cctx.host,
@@ -1366,6 +1379,7 @@ int slbt_set_alternate_host(
ictx->ctx.cctx.ahost.flavor = ictx->ctx.ahost.flavor;
if (slbt_init_host_params(
+ 0,
ctx->cctx,
&ictx->ctx.ahost,
&ictx->ctx.cctx.ahost,