diff options
| author | apnadkarni <apnadkarni@noemail.net> | 2017-09-25 16:33:20 (GMT) |
|---|---|---|
| committer | apnadkarni <apnadkarni@noemail.net> | 2017-09-25 16:33:20 (GMT) |
| commit | 994afed1cf7fa0edabaefc3d6f0d2754cc56ab1f (patch) | |
| tree | cf5640955c1dc703a1a85faeffb541c436a936da | |
| parent | 4ce731e5e74b5dfbdba1d3085dbbb771a87489cc (diff) | |
| download | tcl-994afed1cf7fa0edabaefc3d6f0d2754cc56ab1f.zip tcl-994afed1cf7fa0edabaefc3d6f0d2754cc56ab1f.tar.gz tcl-994afed1cf7fa0edabaefc3d6f0d2754cc56ab1f.tar.bz2 | |
Eliminated /base option on linking as not recommended with ASLR
FossilOrigin-Name: 847eaa26c52fbe4a466a2e94d9973e58ee0db020160554a74ca5ea7450565850
| -rw-r--r-- | win/makefile.vc | 4 | ||||
| -rw-r--r-- | win/rules.vc | 10 |
2 files changed, 5 insertions, 9 deletions
diff --git a/win/makefile.vc b/win/makefile.vc index b42257c..9686d26 100644 --- a/win/makefile.vc +++ b/win/makefile.vc @@ -562,7 +562,7 @@ $(TCLDDELIB): $(TMP_DIR)\tclWinDde.obj $(MAKELIBCMD) $**
!else
$(TCLDDELIB): $(TMP_DIR)\tclWinDde.obj $(TCLSTUBLIB)
- $(MAKEDLLCMD) -base:@$(WINDIR)\coffbase.txt,tcldde $**
+ $(MAKEDLLCMD) $**
$(_VC_MANIFEST_EMBED_DLL)
!endif
@@ -571,7 +571,7 @@ $(TCLREGLIB): $(TMP_DIR)\tclWinReg.obj $(MAKELIBCMD) $**
!else
$(TCLREGLIB): $(TMP_DIR)\tclWinReg.obj $(TCLSTUBLIB)
- $(MAKEDLLCMD) -base:@$(WINDIR)\coffbase.txt,tclreg $**
+ $(MAKEDLLCMD) $**
$(_VC_MANIFEST_EMBED_DLL)
!endif
diff --git a/win/rules.vc b/win/rules.vc index 22379c4..f52b237 100644 --- a/win/rules.vc +++ b/win/rules.vc @@ -847,7 +847,6 @@ TCLIMPLIB = "$(_TCLDIR)\lib\tcl$(TCL_VERSION)$(SUFX).lib" TCL_LIBRARY = $(_TCLDIR)\lib
TCLREGLIB = "$(_TCLDIR)\lib\tclreg13$(SUFX:t=).lib"
TCLDDELIB = "$(_TCLDIR)\lib\tcldde14$(SUFX:t=).lib"
-COFFBASE = \must\have\tcl\sources\to\build\this\target
TCLTOOLSDIR = \must\have\tcl\sources\to\build\this\target
TCL_INCLUDES = -I"$(_TCLDIR)\include"
@@ -862,7 +861,6 @@ TCLIMPLIB = "$(_TCLDIR)\win\$(BUILDDIRTOP)\tcl$(TCL_VERSION)$(SUFX).lib" TCL_LIBRARY = $(_TCLDIR)\library
TCLREGLIB = "$(_TCLDIR)\win\$(BUILDDIRTOP)\tclreg13$(SUFX:t=).lib"
TCLDDELIB = "$(_TCLDIR)\win\$(BUILDDIRTOP)\tcldde14$(SUFX:t=).lib"
-COFFBASE = "$(_TCLDIR)\win\coffbase.txt"
TCLTOOLSDIR = $(_TCLDIR)\tools
TCL_INCLUDES = -I"$(_TCLDIR)\generic" -I"$(_TCLDIR)\win"
@@ -1155,9 +1153,9 @@ $< .SUFFIXES:.c .rc
MAKELIBCMD = $(lib32) -nologo $(LINKERFLAGS) -out:$@
-MAKEDLLCMD = $(link32) $(dlllflags) -base:@$(WINDIR)\coffbase.txt,tcl -out:$@ $(baselibs)
-MAKECONEXECMD = $(link32) $(conlflags) -out:$@ $(baselibs)
-MAKEGUIEXECMD = $(link32) $(guilflags) -out:$@ $(baselibs)
+MAKEDLLCMD = $(link32) $(dlllflags) -out:$@ $(baselibs)
+MAKECONCMD = $(link32) $(conlflags) -out:$@ $(baselibs)
+MAKEGUICMD = $(link32) $(guilflags) -out:$@ $(baselibs)
#----------------------------------------------------------
# Display stats being used.
@@ -1169,7 +1167,5 @@ MAKEGUIEXECMD = $(link32) $(guilflags) -out:$@ $(baselibs) !message *** Optional defines are '$(OPTDEFINES)'
!message *** Compiler version $(VCVER). Target machine is $(MACHINE)
!message *** Host architecture is $(NATIVE_ARCH)
-!message *** Cflags '$(cflags)'
-!message *** Lflags '$(lflags)'
!endif # ifdef _RULES_VC
|