diff options
| author | Guenter Knauf <fuankg@apache.org> | 2014-08-31 13:50:02 +0000 |
|---|---|---|
| committer | Guenter Knauf <fuankg@apache.org> | 2014-08-31 13:50:02 +0000 |
| commit | 279cafaab96a6b5c89cf5a276f743f90903d7d66 (patch) | |
| tree | ec82d215148704cae5f21f8dc688c3b7b7784d71 /build | |
| parent | f71340f2c40c29c298ee5da057fc7222c50313e0 (diff) | |
| download | apr-279cafaab96a6b5c89cf5a276f743f90903d7d66.tar.gz | |
Fix NetWare build: set NLM version with commandline option
instead of linker def file due to bug with mwldnlm linker
where patch version > 26 is ignored from def file.
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1621593 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'build')
| -rw-r--r-- | build/NWGNUtail.inc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/build/NWGNUtail.inc b/build/NWGNUtail.inc index 9444e9ae8..b98ed96f7 100644 --- a/build/NWGNUtail.inc +++ b/build/NWGNUtail.inc @@ -253,6 +253,7 @@ $(OBJDIR)/$(NLM_NAME)_link.opt : $($(NLM_NAME)_LINKOPT_DEPENDS) ifeq "$(findstring mwldnlm,$(LINK))" "mwldnlm" # for Metrowerks CodeWarrior @echo $(DL)# Do not edit this file - it is created by make!$(DL) > $@ @echo $(DL)# All your changes will be lost!!$(DL)>> $@ + @echo $(DL)-nlmversion=$(NLM_VERSION)$(DL)>> $@ @echo $(DL)-warnings off$(DL)>> $@ @echo $(DL)-zerobss$(DL)>> $@ @echo $(DL)-nodefaults$(DL)>> $@ @@ -310,11 +311,9 @@ endif @echo $(DL)threadname "$(NLM_THREAD_NAME)"$(DL)>> $@ @echo $(DL)screenname "$(NLM_SCREEN_NAME)"$(DL)>> $@ @echo $(DL)stacksize $(subst K,000,$(subst k,K,$(strip $(NLM_STACK_SIZE))))$(DL)>> $@ - @echo $(DL)version $(NLM_VERSION) $(DL)>> $@ @echo $(DL)$(strip $(NLM_FLAGS))$(DL)>> $@ @echo $(DL)start $(NLM_ENTRY_SYM)$(DL)>> $@ @echo $(DL)exit $(NLM_EXIT_SYM)$(DL)>> $@ -# @echo $(DL)map $(OBJDIR)/$(NLM_NAME).map$(DL)>> $@ ifneq "$(NLM_CHECK_SYM)" "" @echo $(DL)check $(NLM_CHECK_SYM)$(DL)>> $@ endif @@ -334,6 +333,7 @@ endif ifneq "$(NLM_XDCDATA)" "" @echo $(DL)xdcdata $(notdir $(NLM_XDCDATA))$(DL)>> $@ endif + @echo $(DL)map $(OBJDIR)/$(NLM_NAME).map$(DL)>> $@ else # for GNU nlmconv ifneq "$(FILES_nlm_Ximports)" "" @echo $(DL)import $(strip $(FILES_nlm_Ximports))$(DL)>> $@ @@ -354,6 +354,7 @@ endif ifeq "$(RELEASE)" "debug" @echo $(DL)debug$(DL)>> $@ endif + @echo $(DL)version $(NLM_VERSION) $(DL)>> $@ endif else # more than one target so look for individual makefiles. |