Author: markt
Date: Fri Dec 8 20:55:20 2017
New Revision: 1817564
URL: http://svn.apache.org/viewvc?rev=1817564&view=rev
Log:
Add to OPT_LFLAGS rather than overwrite OPT_LFLAGS when setting /OPT:REF in the
make file for Windows.
Modified:
commons/proper/daemon/trunk/src/changes/changes.xml
commons/proper/daemon/trunk/src/native/windows/include/Makefile.inc
Modified: commons/proper/daemon/trunk/src/changes/changes.xml
URL:
http://svn.apache.org/viewvc/commons/proper/daemon/trunk/src/changes/changes.xml?rev=1817564&r1=1817563&r2=1817564&view=diff
==============================================================================
--- commons/proper/daemon/trunk/src/changes/changes.xml (original)
+++ commons/proper/daemon/trunk/src/changes/changes.xml Fri Dec 8 20:55:20 2017
@@ -40,6 +40,10 @@
<body>
<release version="1.1.1" date="TBD" description="Bug fix release">
<action type="fix" dev="markt" due-to="mturk" >
+ Add to OPT_LFLAGS rather than overwrite OPT_LFLAGS when setting
/OPT:REF
+ in the make file for Windows.
+ </action>
+ <action type="fix" dev="markt" due-to="mturk" >
Only set the global shutdown event if the event is created.
</action>
<action issue="DAEMON-379" type="fix" dev="sebb">
Modified: commons/proper/daemon/trunk/src/native/windows/include/Makefile.inc
URL:
http://svn.apache.org/viewvc/commons/proper/daemon/trunk/src/native/windows/include/Makefile.inc?rev=1817564&r1=1817563&r2=1817564&view=diff
==============================================================================
--- commons/proper/daemon/trunk/src/native/windows/include/Makefile.inc
(original)
+++ commons/proper/daemon/trunk/src/native/windows/include/Makefile.inc Fri Dec
8 20:55:20 2017
@@ -252,7 +252,7 @@ COMMON_LFLAGS = /NOLOGO
# Always add debugging to the linker
OPT_LFLAGS = /INCREMENTAL:NO /DEBUG
!IF "$(BUILD)" == "RELEASE"
-OPT_LFLAGS = /OPT:REF
+OPT_LFLAGS = $(OPT_LFLAGS) /OPT:REF
!ENDIF
!IF "$(TARGET)" == "EXE"
