diff options
| author | Mike Hommey <mh@glandium.org> | 2016-07-29 21:13:39 +0900 |
|---|---|---|
| committer | Mike Hommey <mh@glandium.org> | 2016-07-29 21:13:39 +0900 |
| commit | d75065475859aa2770276319aae64a45de304bd3 (patch) | |
| tree | 67429d1925ccbb2ddb4d744056d8d08b9d7607f4 /coreconf/WIN32.mk | |
| parent | 8c41b8f4960ff16ddeae0741370c4bc0ba6c61dd (diff) | |
| download | nss-hg-d75065475859aa2770276319aae64a45de304bd3.tar.gz | |
Bug 1290334 - Use a LD variable instead of LINK. r=wtc
MSVC's link.exe allows to pass linker flags through the LINK environment
variable[1]. When running under a shell that has the GNU coreutils's
link.exe installed (a tool to create hard links), it can become
necessary to override LINK from the command line. In that case, MAKE
passes down LINK as an environment variable to submake and subprocesses,
which then means it's passed down to link.exe itself, which then tries
to link itself to the rest of the passed arguments, and fails,
presumably because it can't open the executable while it's being
executed (and even if it could, that would still be an invalid thing to
link).
So, change the variable name.
1. https://msdn.microsoft.com/en-us/library/6y6t9esh.aspx
Diffstat (limited to 'coreconf/WIN32.mk')
| -rw-r--r-- | coreconf/WIN32.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/coreconf/WIN32.mk b/coreconf/WIN32.mk index 05bc8bb88..94e19fce8 100644 --- a/coreconf/WIN32.mk +++ b/coreconf/WIN32.mk @@ -13,7 +13,7 @@ DEFAULT_COMPILER = cl ifdef NS_USE_GCC CC = gcc CCC = g++ - LINK = ld + LD = ld AR = ar AR += cr $@ RANLIB = ranlib @@ -23,7 +23,7 @@ ifdef NS_USE_GCC else CC = cl CCC = cl - LINK = link + LD = link LDFLAGS += -nologo AR = lib AR += -nologo -OUT:$@ |