mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-09 11:25:00 +00:00
Bug 913968 - Don't link nspr libraries until the libs tier on non-MOZ_FOLD_LIBS builds. r=khuey
This commit is contained in:
parent
ebc6df6ad1
commit
81280fea33
@ -23,6 +23,10 @@ EXTRA_MAKE_FLAGS := SHARED_LIBRARY= IMPORT_LIBRARY= SHARED_LIB_PDB=
|
||||
# Work around libVersionPoint conflict between all three libraries.
|
||||
# See bug #838566.
|
||||
EXTRA_MAKE_FLAGS += XP_DEFINE=-DlibVersionPoint='libVersionPoint$$(LIBRARY_NAME)'
|
||||
else
|
||||
# nspr's make export compiles and links everything, but linking can't happen
|
||||
# during export on platforms where nspr is linked against mozcrt/mozglue.
|
||||
export:: EXTRA_MAKE_FLAGS := SHARED_LIBRARY= IMPORT_LIBRARY= SHARED_LIB_PDB=
|
||||
endif
|
||||
|
||||
libs export clean distclean::
|
||||
|
Loading…
Reference in New Issue
Block a user