Commit b1350268 authored by Robert Sprowson's avatar Robert Sprowson Committed by ROOL

Fix to module-wrapped LIBS SYMS

Exercising the new library/symbols selector on a more complex case (Help2) showed that the selection never triggered, because where it is placed ${RLIB} is unset.
Move the test to after ModuleLibs/AppLibs are set, and invert the sense (it should have been ifneq).

Version 7.52. Tagged as 'BuildSys-7_52'
parent 887191e2
......@@ -103,14 +103,6 @@ ROM_LIBS += ${C++LIB}
endif
APP_LIBS += ${CLIB}
DBG_LIBS += ${CLIB}
ifeq ($(filter ${RLIB},${ROM_LIBS}),)
ROM_LIBS_ = $(filter-out ${RLIB},${ROM_LIBS})
ROM_LIBS_ += ${ROMSTUBS}
ROM_SYMS = ${ABSSYM}
else
ROM_LIBS_ = ${ROM_LIBS} ${ROMCSTUBS}
ROM_SYMS = ${C_ABSSYM}
endif
WRAPPER ?= ${LIBDIR}/RISC_OSLib/modulewrap.s
APP_OBJS_ = $(addsuffix .o,${APP_OBJS})
......@@ -182,6 +174,14 @@ ifeq ("${INCLUDED_DBGRULES}","")
include DbgRules
endif
ifeq ($(filter ${RLIB},${ROM_LIBS}),)
ROM_LIBS_ = ${ROM_LIBS} ${ROMCSTUBS}
ROM_SYMS = ${C_ABSSYM}
else
ROM_LIBS_ = $(filter-out ${RLIB},${ROM_LIBS}) ${ROMSTUBS}
ROM_SYMS = ${ABSSYM}
endif
all: ${TARGET}${SUFFIX_ABSOLUTE}
@${ECHO} ${COMPONENT}: application built
......
......@@ -120,14 +120,6 @@ ROM_LIBS += ${C++LIB}
endif
APP_LIBS += ${CLIB}
DBG_LIBS += ${DEBUGLIBS} ${CLIB}
ifeq ($(filter ${RLIB},${ROM_LIBS}),)
ROM_LIBS_ = $(filter-out ${RLIB},${ROM_LIBS})
ROM_LIBS_ += ${ROMSTUBS}
ROM_SYMS = ${ABSSYM}
else
ROM_LIBS_ = ${ROM_LIBS} ${ROMCSTUBS}
ROM_SYMS = ${C_ABSSYM}
endif
WRAPPER ?= RISC_OSLib:s.modulewrap
APP_OBJS_ = $(addprefix o.,${APP_OBJS})
......@@ -157,6 +149,14 @@ ifeq ("${INCLUDED_DBGRULES}","")
include DbgRules
endif
ifeq ($(filter ${RLIB},${ROM_LIBS}),)
ROM_LIBS_ = ${ROM_LIBS} ${ROMCSTUBS}
ROM_SYMS = ${C_ABSSYM}
else
ROM_LIBS_ = $(filter-out ${RLIB},${ROM_LIBS}) ${ROMSTUBS}
ROM_SYMS = ${ABSSYM}
endif
all: ${TARGET}
@${ECHO} ${COMPONENT}: application built
......
/* (7.51)
/* (7.52)
*
* This file is automatically maintained by srccommit, do not edit manually.
*
*/
#define Module_MajorVersion_CMHG 7.51
#define Module_MajorVersion_CMHG 7.52
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 24 Oct 2020
#define Module_Date_CMHG 28 Oct 2020
#define Module_MajorVersion "7.51"
#define Module_Version 751
#define Module_MajorVersion "7.52"
#define Module_Version 752
#define Module_MinorVersion ""
#define Module_Date "24 Oct 2020"
#define Module_Date "28 Oct 2020"
#define Module_ApplicationDate "24-Oct-20"
#define Module_ApplicationDate "28-Oct-20"
#define Module_ComponentName "BuildSys"
#define Module_FullVersion "7.51"
#define Module_HelpVersion "7.51 (24 Oct 2020)"
#define Module_LibraryVersionInfo "7:51"
#define Module_FullVersion "7.52"
#define Module_HelpVersion "7.52 (28 Oct 2020)"
#define Module_LibraryVersionInfo "7:52"
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