Skip to content

Commit

Permalink
Merge pull request #948 from jeffhostetler/jeffhostetler/vs2015_optimize
Browse files Browse the repository at this point in the history
Jeffhostetler/vs2015 optimize
  • Loading branch information
Git for Windows Build Agent committed Nov 18, 2016
2 parents fad4dbd + a927975 commit 3a9e707
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 6 deletions.
3 changes: 3 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2559,6 +2559,9 @@ endif
$(RM) GIT-VERSION-FILE GIT-CFLAGS GIT-LDFLAGS GIT-BUILD-OPTIONS
$(RM) GIT-USER-AGENT GIT-PREFIX
$(RM) GIT-SCRIPT-DEFINES GIT-PERL-DEFINES GIT-PYTHON-VARS
ifdef MSVC
$(RM) $(patsubst %.o,%.o.pdb,$(OBJECTS))
endif

.PHONY: all install profile-clean clean strip
.PHONY: shell_compatibility_test please_set_SHELL_PATH_to_a_more_modern_shell
Expand Down
6 changes: 1 addition & 5 deletions compat/vcbuild/README_VS2015.txt
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,4 @@ TODO List:
developer command prompt is started. This would also
allow us to switch between 32- and 64-bit tool chains.

[B] Currently, we leave the third-party DLLs we reference in
"compat/vcbuild/GEN.DEPS/bin". We need an installer
step to move them next to git.exe (or into libexec/git-core).

[C] We need to build SLN or VCPROJ files.
[B] We need to build SLN or VCPROJ files.
2 changes: 1 addition & 1 deletion config.mak.uname
Original file line number Diff line number Diff line change
Expand Up @@ -428,7 +428,7 @@ ifeq ($(uname_S),Windows)
BASIC_CFLAGS += -Zi
BASIC_LDFLAGS += -debug
ifndef DEBUG
BASIC_CFLAGS += -GL -Gy -Os -Oy- -MD -DNDEBUG
BASIC_CFLAGS += -GL -Gy -O2 -Oy- -MD -DNDEBUG
BASIC_LDFLAGS += -release -LTCG /OPT:REF /OPT:ICF /INCREMENTAL:NO /DEBUGTYPE:CV,FIXUP
AR += -LTCG
else
Expand Down

0 comments on commit 3a9e707

Please sign in to comment.