Bug 1034415 - Do not hardcode cl.exe as the NSPR compiler on Windows; r=ted NSPR_4_10_7_BETA3
authorEhsan Akhgari <ehsan@mozilla.com>
Mon, 07 Jul 2014 08:05:07 -0400
changeset 4581 bb86fe1486b3c4fd4f1da46f1d1960216282cd93
parent 4580 3fa631505238131b3e3b4f4a4636006df31addac
child 4582 999168d9899e4b708b3fd3c6c3380771e3ad8b4a
push id125
push usertmielczarek@mozilla.com
push dateMon, 07 Jul 2014 12:05:57 +0000
reviewersted
bugs1034415
Bug 1034415 - Do not hardcode cl.exe as the NSPR compiler on Windows; r=ted
configure
configure.in
--- a/configure
+++ b/configure
@@ -7094,18 +7094,16 @@ tools are selected during the Xcode/Deve
         CC="$CC -mwindows"
         CXX="$CXX -mwindows"
         DLL_SUFFIX=dll
         MKSHLIB='$(CC) -shared -Wl,--export-all-symbols -Wl,--out-implib -Wl,$(IMPORT_LIBRARY) $(DLLBASE) -o $(subst $(OBJDIR)/,,$(SHARED_LIBRARY))'
         RC=$WINDRES
         # Use temp file for windres (bug 213281)
         RCFLAGS='-O coff --use-temp-file'
     else
-        CC=cl
-        CXX=cl
         LD=link
         AR='lib -NOLOGO -OUT:"$@"'
         AR_FLAGS=
         RANLIB='echo not_ranlib'
         STRIP='echo not_strip'
         RC=rc.exe
         GARBAGE='$(OBJDIR)/vc20.pdb $(OBJDIR)/vc40.pdb'
         OBJ_SUFFIX=obj
--- a/configure.in
+++ b/configure.in
@@ -1910,18 +1910,16 @@ tools are selected during the Xcode/Deve
         CC="$CC -mwindows"
         CXX="$CXX -mwindows"
         DLL_SUFFIX=dll
         MKSHLIB='$(CC) -shared -Wl,--export-all-symbols -Wl,--out-implib -Wl,$(IMPORT_LIBRARY) $(DLLBASE) -o $(subst $(OBJDIR)/,,$(SHARED_LIBRARY))'
         RC=$WINDRES
         # Use temp file for windres (bug 213281)
         RCFLAGS='-O coff --use-temp-file'
     else
-        CC=cl
-        CXX=cl
         LD=link
         AR='lib -NOLOGO -OUT:"$@"'
         AR_FLAGS=
         RANLIB='echo not_ranlib'
         STRIP='echo not_strip'
         RC=rc.exe
         GARBAGE='$(OBJDIR)/vc20.pdb $(OBJDIR)/vc40.pdb'
         OBJ_SUFFIX=obj