diff options
| author | midipix <writeonce@midipix.org> | 2018-10-15 02:17:28 -0400 |
|---|---|---|
| committer | midipix <writeonce@midipix.org> | 2018-10-15 02:30:20 -0400 |
| commit | ecd3000aff8e52a5eca05b4bde06a0f25968f9b6 (patch) | |
| tree | cc6a76b4402a3e0e9e147fe19a0b7afe5f513b82 | |
| parent | 0cbb204d98d8c0425abc7a228f7d951b45b78544 (diff) | |
| download | slibtool-ecd3000aff.tar.bz2 slibtool-ecd3000aff.tar.xz | |
slbt_exec_link_create_dep_file(): simplify given the recent argv normalization.
| -rw-r--r-- | src/logic/slbt_exec_link.c | 23 |
1 files changed, 4 insertions, 19 deletions
diff --git a/src/logic/slbt_exec_link.c b/src/logic/slbt_exec_link.c index d3ae8be..0648d29 100644 --- a/src/logic/slbt_exec_link.c +++ b/src/logic/slbt_exec_link.c @@ -747,32 +747,17 @@ static int slbt_exec_link_create_dep_file( path = 0; mapinfo = 0; - if (!strcmp(*parg,"-l")) { - popt = *parg++; - plib = *parg; - } else if (!strcmp(*parg,"--library")) { - popt = *parg++; - plib = *parg; - } else if (!strncmp(*parg,"-l",2)) { + if (!strncmp(*parg,"-l",2)) { popt = *parg; plib = popt + 2; - } else if (!strncmp(*parg,"--library=",10)) { - popt = *parg; - plib = popt + 10; - } else if (!strcmp(*parg,"-L")) { - popt = *parg++; - path = *parg; - } else if (!strcmp(*parg,"--library-path")) { - popt = *parg++; - path = *parg; + } else if (!strncmp(*parg,"-L",2)) { popt = *parg; path = popt + 2; - } else if (!strncmp(*parg,"--library-path=",15)) { - popt = *parg; - path = popt + 15; + } else if (!strncmp(*parg,"-f",2)) { (void)0; + } else if ((popt = strrchr(*parg,'.')) && !strcmp(popt,".la")) { /* import dependency list */ if ((base = strrchr(*parg,'/'))) |