The Tor Browser: security/nss/lib/util/config.mk@b8a032363ba2

Incorporate requested changes from Mozilla in review:
https://bugzilla.mozilla.org/show_bug.cgi?id=1123480#c6

1 #

     2 # This Source Code Form is subject to the terms of the Mozilla Public

     3 # License, v. 2.0. If a copy of the MPL was not distributed with this

     4 # file, You can obtain one at http://mozilla.org/MPL/2.0/.

     6 # can't do this in manifest.mn because OS_TARGET isn't defined there.

     7 ifeq (,$(filter-out WIN%,$(OS_TARGET)))

     9 # don't want the 32 in the shared library name

    10 SHARED_LIBRARY = $(OBJDIR)/$(DLL_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX)

    11 IMPORT_LIBRARY = $(OBJDIR)/$(IMPORT_LIB_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION)$(IMPORT_LIB_SUFFIX)

    13 RES = $(OBJDIR)/$(LIBRARY_NAME).res

    14 RESNAME = $(LIBRARY_NAME).rc

    16 ifdef NS_USE_GCC

    17 EXTRA_SHARED_LIBS += \

    18 	-L$(DIST)/lib \

    19 	-L$(NSPR_LIB_DIR) \

    20 	-lplc4 \

    21 	-lplds4 \

    22 	-lnspr4\

    23 	$(NULL)

    24 else # ! NS_USE_GCC

    25 EXTRA_SHARED_LIBS += \

    26 	$(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)plc4.lib \

    27 	$(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)plds4.lib \

    28 	$(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)nspr4.lib \

    29 	$(NULL)

    30 endif # NS_USE_GCC

    32 else

    34 # $(PROGRAM) has NO explicit dependencies on $(EXTRA_SHARED_LIBS)

    35 # $(EXTRA_SHARED_LIBS) come before $(OS_LIBS), except on AIX.

    36 EXTRA_SHARED_LIBS += \

    37 	-L$(DIST)/lib \

    38 	-L$(NSPR_LIB_DIR) \

    39 	-lplc4 \

    40 	-lplds4 \

    41 	-lnspr4 \

    42 	$(NULL)

    44 endif

The Tor Browser / file revision