summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authormidipix <writeonce@midipix.org>2018-11-10 13:07:37 -0500
committermidipix <writeonce@midipix.org>2018-11-10 15:42:28 -0500
commit339022d6cae668e41bdad36a46710e9cc90b95e2 (patch)
tree85fef6a3cda21ec7c28ca61d1ed70c6832d9321f
parentb9fe97a3d78232f54a3e671c0c6c725047df586f (diff)
downloadslibtool-339022d6cae668e41bdad36a46710e9cc90b95e2.tar.bz2
slibtool-339022d6cae668e41bdad36a46710e9cc90b95e2.tar.xz
driver: host flavors: added suffixed suffixes support.
-rw-r--r--include/slibtool/slibtool.h2
-rw-r--r--src/driver/slbt_driver_ctx.c14
2 files changed, 9 insertions, 7 deletions
diff --git a/include/slibtool/slibtool.h b/include/slibtool/slibtool.h
index 2335ae5..d28cb8d 100644
--- a/include/slibtool/slibtool.h
+++ b/include/slibtool/slibtool.h
@@ -216,6 +216,8 @@ struct slbt_flavor_settings {
const char * arsuffix;
const char * dsoprefix;
const char * dsosuffix;
+ const char * osdsuffix;
+ const char * osdfussix;
const char * exeprefix;
const char * exesuffix;
const char * impprefix;
diff --git a/src/driver/slbt_driver_ctx.c b/src/driver/slbt_driver_ctx.c
index f013928..a898205 100644
--- a/src/driver/slbt_driver_ctx.c
+++ b/src/driver/slbt_driver_ctx.c
@@ -35,41 +35,41 @@ static const struct slbt_source_version slbt_src_version = {
/* flavor settings */
#define SLBT_FLAVOR_SETTINGS(flavor, \
bfmt,pic, \
- arp,ars,dsop,dsos, \
+ arp,ars,dsop,dsos,osds,osdf, \
exep,exes,impp,imps, \
ldenv) \
static const struct slbt_flavor_settings flavor = { \
- bfmt,arp,ars,dsop,dsos, \
+ bfmt,arp,ars,dsop,dsos,osds,osdf, \
exep,exes,impp,imps, \
ldenv,pic}
SLBT_FLAVOR_SETTINGS(host_flavor_default, \
"elf","-fPIC", \
- "lib",".a","lib",".so", \
+ "lib",".a","lib",".so",".so","", \
"","","","", \
"LD_LIBRARY_PATH");
SLBT_FLAVOR_SETTINGS(host_flavor_midipix, \
"pe","-fPIC", \
- "lib",".a","lib",".so", \
+ "lib",".a","lib",".so",".so","", \
"","","lib",".lib.a", \
"LD_LIBRARY_PATH");
SLBT_FLAVOR_SETTINGS(host_flavor_mingw, \
"pe",0, \
- "lib",".a","lib",".dll", \
+ "lib",".a","lib",".dll","",".dll", \
"",".exe","lib",".dll.a", \
"PATH");
SLBT_FLAVOR_SETTINGS(host_flavor_cygwin, \
"pe",0, \
- "lib",".a","lib",".dll", \
+ "lib",".a","lib",".dll","",".dll", \
"",".exe","lib",".dll.a", \
"PATH");
SLBT_FLAVOR_SETTINGS(host_flavor_darwin, \
"macho","-fPIC", \
- "lib",".a","lib",".dylib", \
+ "lib",".a","lib",".dylib","",".dylib", \
"","","","", \
"DYLD_LIBRARY_PATH");