In the monolithic build, we must always define SRC etc, since that is used
outside the script. This must happen even if the monolithic build has already occurred.
This commit is contained in:
parent
3e7fd2dd59
commit
becb94e1d4
|
@ -2,11 +2,11 @@
|
|||
# @NAME@_MONOLITHIC
|
||||
#
|
||||
|
||||
SRC="obj/@NAME@.cpp"
|
||||
MONOLITHIC_TESTS="src/@NAME@/build.app src/@NAME@/build.monolithic"
|
||||
|
||||
if [ -z "${@NAME@_MONOLITHIC}" ]
|
||||
then
|
||||
SRC="obj/@NAME@.cpp"
|
||||
|
||||
MONOLITHIC_TESTS="src/@NAME@/build.app src/@NAME@/build.monolithic"
|
||||
MONOLITHIC_SOURCE="$(echo src/@NAME@/TopHeader.h) $(echo src/@NAME@/TopSource.cpp)"
|
||||
make_monolithic ${SRC} C || return 1
|
||||
|
||||
|
|
|
@ -1,12 +1,13 @@
|
|||
# These are external variables, and shouldn't clash with anything else
|
||||
# @CNAME@_MONOLITHIC
|
||||
|
||||
SRC="obj/@NAME@.cpp"
|
||||
HDR="obj/@HEADER_NAME@"
|
||||
|
||||
MONOLITHIC_TESTS="src/@NAME@/build.lib src/@NAME@/build.monolithic"
|
||||
|
||||
if [ -z "${@CNAME@_MONOLITHIC}" ]
|
||||
then
|
||||
SRC="obj/@NAME@.cpp"
|
||||
HDR="obj/@HEADER_NAME@"
|
||||
|
||||
MONOLITHIC_TESTS="src/@NAME@/build.lib src/@NAME@/build.monolithic"
|
||||
MONOLITHIC_SOURCE="$(echo src/@NAME@/{TopHeader,BottomHeader}.h)"
|
||||
make_monolithic ${HDR} C || return 1
|
||||
|
||||
|
|
|
@ -2,11 +2,11 @@
|
|||
# @NAME@_MONOLITHIC
|
||||
#
|
||||
|
||||
SRC="obj/@NAME@.c"
|
||||
MONOLITHIC_TESTS="src/@NAME@/build.app src/@NAME@/build.monolithic"
|
||||
|
||||
if [ -z "${@NAME@_MONOLITHIC}" ]
|
||||
then
|
||||
SRC="obj/@NAME@.c"
|
||||
|
||||
MONOLITHIC_TESTS="src/@NAME@/build.app src/@NAME@/build.monolithic"
|
||||
MONOLITHIC_SOURCE="$(echo src/@NAME@/TopHeader.h) $(echo src/@NAME@/TopSource.c)"
|
||||
make_monolithic ${SRC} C || return 1
|
||||
|
||||
|
|
|
@ -1,12 +1,13 @@
|
|||
# These are external variables, and shouldn't clash with anything else
|
||||
# @CNAME@_MONOLITHIC
|
||||
|
||||
SRC="obj/@NAME@.c"
|
||||
HDR="obj/@HEADER_NAME@"
|
||||
|
||||
MONOLITHIC_TESTS="src/@NAME@/build.lib src/@NAME@/build.monolithic"
|
||||
|
||||
if [ -z "${@CNAME@_MONOLITHIC}" ]
|
||||
then
|
||||
SRC="obj/@NAME@.c"
|
||||
HDR="obj/@HEADER_NAME@"
|
||||
|
||||
MONOLITHIC_TESTS="src/@NAME@/build.lib src/@NAME@/build.monolithic"
|
||||
MONOLITHIC_SOURCE="$(echo src/@NAME@/{TopHeader,BottomHeader}.h)"
|
||||
make_monolithic ${HDR} C || return 1
|
||||
|
||||
|
|
|
@ -2,11 +2,11 @@
|
|||
# @NAME@_MONOLITHIC
|
||||
#
|
||||
|
||||
SRC="obj/@NAME@.c"
|
||||
MONOLITHIC_TESTS="src/@NAME@/build.firmware src/@NAME@/build.monolithic"
|
||||
|
||||
if [ -z "${@NAME@_MONOLITHIC}" ]
|
||||
then
|
||||
SRC="obj/@NAME@.c"
|
||||
|
||||
MONOLITHIC_TESTS="src/@NAME@/build.firmware src/@NAME@/build.monolithic"
|
||||
MONOLITHIC_SOURCE="$(echo src/@NAME@/TopHeader.h) $(echo src/@NAME@/TopSource.c)"
|
||||
make_monolithic ${SRC} C || return 1
|
||||
|
||||
|
|
Loading…
Reference in New Issue