summaryrefslogtreecommitdiffhomepage
path: root/src/driver
diff options
context:
space:
mode:
authormidipix <writeonce@midipix.org>2018-02-26 22:34:54 -0500
committermidipix <writeonce@midipix.org>2018-02-26 22:34:54 -0500
commitd7eb710ed9096680e9783cd43516e0f49163a546 (patch)
tree4501a3bbb75bb043feb94da716e42ab3f2535b46 /src/driver
parent0d282345b3e69f0c9f17a8b7b37daa9b89e6714d (diff)
downloadslibtool-d7eb710ed9096680e9783cd43516e0f49163a546.tar.bz2
slibtool-d7eb710ed9096680e9783cd43516e0f49163a546.tar.xz
driver: slbt_init_host_params(): improve native target detection logic.
Diffstat (limited to 'src/driver')
-rw-r--r--src/driver/slbt_driver_ctx.c47
1 files changed, 45 insertions, 2 deletions
diff --git a/src/driver/slbt_driver_ctx.c b/src/driver/slbt_driver_ctx.c
index 8d2fa6e..ed267cd 100644
--- a/src/driver/slbt_driver_ctx.c
+++ b/src/driver/slbt_driver_ctx.c
@@ -357,6 +357,32 @@ static int slbt_split_argv(
return 0;
}
+static void slbt_get_host_quad(
+ char * hostbuf,
+ char ** hostquad)
+{
+ char * mark;
+ char * ch;
+ int i;
+
+ for (i=0, ch=hostbuf, mark=hostbuf; *ch && i<4; ch++) {
+ if (*ch == '-') {
+ *ch = 0;
+ hostquad[i++] = mark;
+ mark = &ch[1];
+ }
+ }
+
+ if (i<4)
+ hostquad[i] = mark;
+
+ if (i==3) {
+ hostquad[1] = hostquad[2];
+ hostquad[2] = hostquad[3];
+ hostquad[3] = 0;
+ }
+}
+
static int slbt_init_host_params(
const struct slbt_common_ctx * cctx,
struct slbt_host_strs * drvhost,
@@ -373,7 +399,11 @@ static int slbt_init_host_params(
bool fcompiler = false;
bool fnative = false;
bool fdumpmachine = false;
- char buf[256];
+ char buf [256];
+ char hostbuf [256];
+ char machinebuf [256];
+ char * hostquad [4];
+ char * machinequad[4];
/* base */
if ((base = strrchr(cctx->cargv[0],'/')))
@@ -416,8 +446,21 @@ static int slbt_init_host_params(
host->host = drvhost->host;
fcompiler = true;
- fnative = (!(strcmp(host->host,drvhost->machine)));
+ fnative = !strcmp(host->host,drvhost->machine);
cfgmeta->host = fnative ? cfgnmachine : cfgxmachine;
+
+ if (!fnative) {
+ strcpy(hostbuf,host->host);
+ strcpy(machinebuf,drvhost->machine);
+
+ slbt_get_host_quad(hostbuf,hostquad);
+ slbt_get_host_quad(machinebuf,machinequad);
+
+ if (hostquad[2] && machinequad[2])
+ fnative = !strcmp(hostquad[0],machinequad[0])
+ && !strcmp(hostquad[1],machinequad[1])
+ && !strcmp(hostquad[2],machinequad[2]);
+ }
} else {
host->host = drvhost->machine;
cfgmeta->host = cfgnmachine;