From 36d22a5a10939bd29cb7dc3de8d0435a025b55e3 Mon Sep 17 00:00:00 2001 From: midipix Date: Feb 14 2024 16:58:19 +0000 Subject: link mode: darwin support: fix target detection (.flavor, not .host). --- diff --git a/src/logic/linkcmd/slbt_linkcmd_dsolib.c b/src/logic/linkcmd/slbt_linkcmd_dsolib.c index a00a8df..f510abe 100644 --- a/src/logic/linkcmd/slbt_linkcmd_dsolib.c +++ b/src/logic/linkcmd/slbt_linkcmd_dsolib.c @@ -105,7 +105,7 @@ int slbt_exec_link_create_library( /* --no-undefined */ if (dctx->cctx->drvflags & SLBT_DRIVER_NO_UNDEFINED) - *ectx->noundef = !strcmp(dctx->cctx->host.host,"darwin") + *ectx->noundef = !strcmp(dctx->cctx->host.flavor,"darwin") ? "-Wl,-undefined,error" : "-Wl,--no-undefined"; @@ -117,7 +117,7 @@ int slbt_exec_link_create_library( char wl_soname[24]; - if (!strcmp(dctx->cctx->host.host,"darwin")) { + if (!strcmp(dctx->cctx->host.flavor,"darwin")) { strcpy(wl_soname,"-Wl,-install_name"); } else { strcpy(wl_soname,"-Wl,-soname"); diff --git a/src/logic/linkcmd/slbt_linkcmd_executable.c b/src/logic/linkcmd/slbt_linkcmd_executable.c index 449928f..9fd3274 100644 --- a/src/logic/linkcmd/slbt_linkcmd_executable.c +++ b/src/logic/linkcmd/slbt_linkcmd_executable.c @@ -116,7 +116,7 @@ int slbt_exec_link_create_executable( /* --no-undefined */ if (dctx->cctx->drvflags & SLBT_DRIVER_NO_UNDEFINED) - *ectx->noundef = !strcmp(dctx->cctx->host.host,"darwin") + *ectx->noundef = !strcmp(dctx->cctx->host.flavor,"darwin") ? "-Wl,-undefined,error" : "-Wl,--no-undefined";