diff options
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | 2018-03-26 23:31:44 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-03-27 15:45:04 -0700 |
| commit | 58c944a6dec0a8d5e10d2950ab36b7bf84f4d466 (patch) | |
| tree | 11bae4da510931dbd3894938c589e1730c2d3748 | |
| parent | 83dcaedd50592bb8fa6b912a3399efdb9a5e1b03 (diff) | |
| download | git-js/runtime-prefix-windows.tar.gz | |
mingw/msvc: use the new-style RUNTIME_PREFIX helperjs/runtime-prefix-windows
This change also allows us to stop overriding argv[0] with the absolute
path of the executable, allowing us to preserve e.g. the case of the
executable's file name.
This fixes https://github.com/git-for-windows/git/issues/1496 partially.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | compat/mingw.c | 5 | ||||
| -rw-r--r-- | config.mak.uname | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/compat/mingw.c b/compat/mingw.c index 2d44d21aca..12293b416d 100644 --- a/compat/mingw.c +++ b/compat/mingw.c @@ -2210,7 +2210,7 @@ void mingw_startup(void) die_startup(); /* determine size of argv and environ conversion buffer */ - maxlen = wcslen(_wpgmptr); + maxlen = wcslen(wargv[0]); for (i = 1; i < argc; i++) maxlen = max(maxlen, wcslen(wargv[i])); for (i = 0; wenv[i]; i++) @@ -2230,8 +2230,7 @@ void mingw_startup(void) buffer = malloc_startup(maxlen); /* convert command line arguments and environment to UTF-8 */ - __argv[0] = wcstoutfdup_startup(buffer, _wpgmptr, maxlen); - for (i = 1; i < argc; i++) + for (i = 0; i < argc; i++) __argv[i] = wcstoutfdup_startup(buffer, wargv[i], maxlen); for (i = 0; wenv[i]; i++) environ[i] = wcstoutfdup_startup(buffer, wenv[i], maxlen); diff --git a/config.mak.uname b/config.mak.uname index e1cfe5e5ed..a6e734c5d4 100644 --- a/config.mak.uname +++ b/config.mak.uname @@ -357,6 +357,7 @@ ifeq ($(uname_S),Windows) SNPRINTF_RETURNS_BOGUS = YesPlease NO_SVN_TESTS = YesPlease RUNTIME_PREFIX = YesPlease + HAVE_WPGMPTR = YesWeDo NO_ST_BLOCKS_IN_STRUCT_STAT = YesPlease NO_NSEC = YesPlease USE_WIN32_MMAP = YesPlease @@ -506,6 +507,7 @@ ifneq (,$(findstring MINGW,$(uname_S))) NO_SVN_TESTS = YesPlease NO_PERL_MAKEMAKER = YesPlease RUNTIME_PREFIX = YesPlease + HAVE_WPGMPTR = YesWeDo NO_ST_BLOCKS_IN_STRUCT_STAT = YesPlease NO_NSEC = YesPlease USE_WIN32_MMAP = YesPlease |