Skip to content

Commit e487cda

Browse files
author
Git for Windows Build Agent
committed
Merge pull request #948 from jeffhostetler/jeffhostetler/vs2015_optimize
Jeffhostetler/vs2015 optimize
2 parents 6e6e18a + a14d1f8 commit e487cda

File tree

3 files changed

+5
-6
lines changed

3 files changed

+5
-6
lines changed

Makefile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2558,6 +2558,9 @@ endif
25582558
$(RM) GIT-VERSION-FILE GIT-CFLAGS GIT-LDFLAGS GIT-BUILD-OPTIONS
25592559
$(RM) GIT-USER-AGENT GIT-PREFIX
25602560
$(RM) GIT-SCRIPT-DEFINES GIT-PERL-DEFINES GIT-PYTHON-VARS
2561+
ifdef MSVC
2562+
$(RM) $(patsubst %.o,%.o.pdb,$(OBJECTS))
2563+
endif
25612564

25622565
.PHONY: all install profile-clean clean strip
25632566
.PHONY: shell_compatibility_test please_set_SHELL_PATH_to_a_more_modern_shell

compat/vcbuild/README_VS2015.txt

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,4 @@ TODO List:
5151
developer command prompt is started. This would also
5252
allow us to switch between 32- and 64-bit tool chains.
5353

54-
[B] Currently, we leave the third-party DLLs we reference in
55-
"compat/vcbuild/GEN.DEPS/bin". We need an installer
56-
step to move them next to git.exe (or into libexec/git-core).
57-
58-
[C] We need to build SLN or VCPROJ files.
54+
[B] We need to build SLN or VCPROJ files.

config.mak.uname

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -428,7 +428,7 @@ ifeq ($(uname_S),Windows)
428428
BASIC_CFLAGS += -Zi
429429
BASIC_LDFLAGS += -debug
430430
ifndef DEBUG
431-
BASIC_CFLAGS += -GL -Gy -Os -Oy- -MD -DNDEBUG
431+
BASIC_CFLAGS += -GL -Gy -O2 -Oy- -MD -DNDEBUG
432432
BASIC_LDFLAGS += -release -LTCG /OPT:REF /OPT:ICF /INCREMENTAL:NO /DEBUGTYPE:CV,FIXUP
433433
AR += -LTCG
434434
else

0 commit comments

Comments
 (0)