diff options
| author | Chad Elliott <elliottc@objectcomputing.com> | 2019-04-22 08:59:47 -0500 |
|---|---|---|
| committer | Chad Elliott <elliottc@objectcomputing.com> | 2019-04-22 08:59:47 -0500 |
| commit | 116da374557ec5859c2c78a9846feffbbbef3772 (patch) | |
| tree | 2064a8de8c2e1bb9346651cab5f3da254347713d /templates/iar.mpd | |
| parent | 599f423d5e764338f89ef7c49f6a4363d0b2e700 (diff) | |
| download | MPC-116da374557ec5859c2c78a9846feffbbbef3772.tar.gz | |
Mon Apr 22 13:57:40 UTC 2019 Chad Elliott <elliott_c@ociweb.com>
* modules/CDT6WorkspaceCreator.pm:
* modules/DirectoryManager.pm:
* modules/TemplateParser.pm:
* modules/WorkspaceCreator.pm:
Replaced calls to Cwd::abs_path with an implementation in
DirectoryManger that accounts for needs of Win32 specific
paths.
* templates/iar.mpd:
* templates/iar.mpt:
Fixes for linking executables and creating libraries. Also
added the use of lib_modifier.
Diffstat (limited to 'templates/iar.mpd')
| -rw-r--r-- | templates/iar.mpd | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/templates/iar.mpd b/templates/iar.mpd index 8972c197..d7204343 100644 --- a/templates/iar.mpd +++ b/templates/iar.mpd @@ -41,7 +41,7 @@ </option> <option> <name>GOutputBinary</name> - <state>0</state> + <state><%if(exename)%>0<%else%>1<%endif%></state> </option> <option> <name>OGCoreOrChip</name> @@ -50,12 +50,12 @@ <option> <name>GRuntimeLibSelect</name> <version>0</version> - <state>1</state> + <state>2</state> </option> <option> <name>GRuntimeLibSelectSlave</name> <version>0</version> - <state>1</state> + <state>2</state> </option> <option> <name>RTDescription</name> @@ -607,9 +607,7 @@ </option> <option> <name>AUserIncludes</name> -<%foreach(libpaths)%> - <state><%libpath%></state> -<%endfor%> + <state></state> </option> <option> <name>AExtraOptionsCheckV2</name> @@ -686,7 +684,7 @@ <debug><%debug%></debug> <option> <name>IlinkOutputFile</name> - <state><%if(exename)%><%exename%>.out<%endif%></state> + <state><%full_path(exeout)%>\<%if(exename)%><%exename%><%exe_ext%><%endif%></state> </option> <option> <name>IlinkLibIOConfig</name> @@ -801,6 +799,9 @@ <state> --redirect __iar_dlmalloc=malloc</state> <state> --redirect __iar_dlcalloc=calloc</state> <state> --redirect __iar_dlfree=free</state> +<%foreach(libpaths)%> + <state>-L<%full_path(libpath)%></state> +<%endfor%> </option> <option> <name>IlinkLowLevelInterfaceSlave</name> @@ -814,10 +815,10 @@ <name>IlinkAdditionalLibs</name> <%if(exename)%> <%foreach(libs)%> - <state><%lib%><%lib_modifier%>.a</state> + <state><%lib_prefix%><%lib%><%if(use_lib_modifier)%><%lib_modifier%><%endif%><%lib_ext%></state> <%endfor%> <%foreach(lit_libs)%> - <state><%lit_lib%>.a</state> + <state><%lib_prefix%><%lit_lib%><%lib_ext%></state> <%endfor%> <%foreach(pure_libs)%> <state><%pure_lib%></state> @@ -1026,11 +1027,11 @@ </option> <option> <name>IarchiveOverride</name> - <state>0</state> + <state><%if(staticname)%>1<%else%>0<%endif%></state> </option> <option> <name>IarchiveOutput</name> - <state><%staticname%></state> + <state><%full_path(libout)%>\<%lib_prefix%><%staticname%><%if(use_lib_modifier)%><%lib_modifier%><%endif%><%lib_ext%></state> </option> </data> </settings> |