Commit 8b13a6f5 authored by Jeffrey Lee's avatar Jeffrey Lee
Browse files

Fix toolbox modules to build from clean

Detail:
  TboxMake - The ${ROM_MODULE} target had a dependency against ${C_ABSSYM}, but the shared C library only exports that file during the rom_link phase, preventing the toolbox 'rom' phases from completing properly.
  Additionally the rom_link phase in TboxMake didn't have a dependency on ${ROM_MODULE}, so any changes to the module (or previous failure to build) would prevent the rom-linked version of the module from being created or updated properly.
Admin:
  Tested with building OMAP3Live from clean.
  ROM image built OK but untested at runtime.


Version 0.19. Tagged as 'Common-0_19'
parent b566a2c9
......@@ -118,7 +118,7 @@ ${DBG_MODULE}: ${DBG_OBJS} ${DBG_LIBS} ${CLIB} ${RAM_DEPEND} ${DIRS}
${RAM_MODULE}: ${RAM_OBJS} ${RAM_LIBS} ${CLIB} ${RAM_DEPEND} ${DIRS}
${LD} ${LDFLAGS} ${LDRAMFLAGS} -o $@ -rmf ${RAM_OBJS} ${ROM_LIBS} ${CLIB}
${ROM_MODULE}: ${ROM_OBJS} ${ROM_LIBS} ${C_ABSSYM} ${ROM_DEPEND} ${DIRS}
${ROM_MODULE}: ${ROM_OBJS} ${ROM_LIBS} ${ROM_DEPEND} ${DIRS}
${LD} ${LDFLAGS} ${LDLINKFLAGS} -o $@ -aof ${ROM_OBJS} ${ROM_LIBS} ${ROMCSTUBS}
trace: ${DBG_MODULE} ${DIRS}
......@@ -130,7 +130,7 @@ all: ${RAM_MODULE} ${DIRS}
rom: ${ROM_MODULE} ${DIRS}
@${ECHO} ${COMPONENT}: rom module built
rom_link: ${DIRS}
rom_link: ${DIRS} ${ROM_MODULE} ${C_ABSSYM}
${LD} ${LDFLAGS} ${LDLINKFLAGS} -o ${ABS_MODULE} -rmf -base ${ADDRESS} ${ROM_MODULE} ${C_ABSSYM}
${CP} ${ABS_MODULE} ${LINKDIR}.${TARGET} ${CPFLAGS}
@${ECHO} ${COMPONENT}: rom_link complete
......
/* (0.18)
/* (0.19)
*
* This file is automatically maintained by srccommit, do not edit manually.
* Last processed by srccommit version: 1.1.
*
*/
#define Module_MajorVersion_CMHG 0.18
#define Module_MajorVersion_CMHG 0.19
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 04 Feb 2012
#define Module_Date_CMHG 05 Feb 2012
#define Module_MajorVersion "0.18"
#define Module_Version 18
#define Module_MajorVersion "0.19"
#define Module_Version 19
#define Module_MinorVersion ""
#define Module_Date "04 Feb 2012"
#define Module_Date "05 Feb 2012"
#define Module_ApplicationDate "04-Feb-12"
#define Module_ApplicationDate "05-Feb-12"
#define Module_ComponentName "Common"
#define Module_ComponentPath "castle/RiscOS/Sources/Toolbox/Common"
#define Module_FullVersion "0.18"
#define Module_HelpVersion "0.18 (04 Feb 2012)"
#define Module_LibraryVersionInfo "0:18"
#define Module_FullVersion "0.19"
#define Module_HelpVersion "0.19 (05 Feb 2012)"
#define Module_LibraryVersionInfo "0:19"
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment