Commit aacc2b74 authored by Ben Avison's avatar Ben Avison
Browse files

Bugfix to CModule makefile from previous commit

Detail:
  A line in this makefile evaluates CFLAGS so that the default static data
  relocation and stack checking options can be inserted before any overrides
  from the top-level makefile. But this was being done before StdTools was
  included, so C_STKCHK had not yet been defined, so if the top-level makefile
  tried to use it, it had no effect.
Admin:
  Tested using new FrontEnd makefile.

Version 5.13. Tagged as 'BuildSys-5_13'
parent 684d01e3
......@@ -159,7 +159,6 @@ ROM_LIBS ?= ${LIBS}
SA_LIBS ?= ${LIBS}
DBG_LIBS += ${DEBUGLIBS}
CFLAGS := -zM -zps1 ${CFLAGS}
OBJS_ = $(addprefix o.,${OBJS})
ROM_OBJS_ = $(addprefix o.,${ROM_OBJS})
SA_OBJS_ = $(addprefix o.,${SA_OBJS})
......@@ -184,6 +183,8 @@ ifeq ("${INCLUDED_MODULELIBS}","")
include ModuleLibs
endif
CFLAGS := -zM -zps1 ${CFLAGS}
ifeq ("${INCLUDED_MODSTDRULE}","")
include ModStdRule
endif
......
/* (5.12)
/* (5.13)
*
* This file is automatically maintained by srccommit, do not edit manually.
* Last processed by srccommit version: 1.1.
*
*/
#define Module_MajorVersion_CMHG 5.12
#define Module_MajorVersion_CMHG 5.13
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 31 Mar 2011
#define Module_Date_CMHG 03 Apr 2011
#define Module_MajorVersion "5.12"
#define Module_Version 512
#define Module_MajorVersion "5.13"
#define Module_Version 513
#define Module_MinorVersion ""
#define Module_Date "31 Mar 2011"
#define Module_Date "03 Apr 2011"
#define Module_ApplicationDate "31-Mar-11"
#define Module_ApplicationDate "03-Apr-11"
#define Module_ComponentName "BuildSys"
#define Module_ComponentPath "castle/RiscOS/BuildSys"
#define Module_FullVersion "5.12"
#define Module_HelpVersion "5.12 (31 Mar 2011)"
#define Module_LibraryVersionInfo "5:12"
#define Module_FullVersion "5.13"
#define Module_HelpVersion "5.13 (03 Apr 2011)"
#define Module_LibraryVersionInfo "5:13"
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