mirror of
https://github.com/mozilla/gecko-dev.git
synced 2025-02-09 08:48:07 +00:00
Whoops - only use name.lib if OS_ARCH is WINNT
This commit is contained in:
parent
effdd39acc
commit
4f508b6fae
@ -162,16 +162,16 @@ PLCBASE=plc$(NSPR_LIBVERSION)
|
|||||||
PLDSBASE=plds$(NSPR_LIBVERSION)
|
PLDSBASE=plds$(NSPR_LIBVERSION)
|
||||||
NSPRBASE=nspr$(NSPR_LIBVERSION)
|
NSPRBASE=nspr$(NSPR_LIBVERSION)
|
||||||
|
|
||||||
ifeq ($(OS_TARGET), WIN95)
|
ifeq ($(OS_ARCH), WINNT)
|
||||||
PLC_BASENAME=$(PLCBASE)
|
|
||||||
PLDS_BASENAME=$(PLDSBASE)
|
|
||||||
NSPR_BASENAME=$(NSPRBASE)
|
|
||||||
DYNAMICNSPR = -l$(PLCBASE) -l$(PLDSBASE) -l$(NSPRBASE)
|
|
||||||
else
|
|
||||||
PLC_BASENAME=lib$(PLCBASE)
|
PLC_BASENAME=lib$(PLCBASE)
|
||||||
PLDS_BASENAME=lib$(PLDSBASE)
|
PLDS_BASENAME=lib$(PLDSBASE)
|
||||||
NSPR_BASENAME=lib$(NSPRBASE)
|
NSPR_BASENAME=lib$(NSPRBASE)
|
||||||
DYNAMICNSPR = $(PLC_BASENAME).$(LIB_SUFFIX) $(PLDS_BASENAME).$(LIB_SUFFIX) $(NSPR_BASENAME).$(LIB_SUFFIX)
|
DYNAMICNSPR = $(PLC_BASENAME).$(LIB_SUFFIX) $(PLDS_BASENAME).$(LIB_SUFFIX) $(NSPR_BASENAME).$(LIB_SUFFIX)
|
||||||
|
else
|
||||||
|
PLC_BASENAME=$(PLCBASE)
|
||||||
|
PLDS_BASENAME=$(PLDSBASE)
|
||||||
|
NSPR_BASENAME=$(NSPRBASE)
|
||||||
|
DYNAMICNSPR = -l$(PLCBASE) -l$(PLDSBASE) -l$(NSPRBASE)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
# use the NSPRLINK macro in other makefiles to define the linker command line
|
# use the NSPRLINK macro in other makefiles to define the linker command line
|
||||||
|
Loading…
x
Reference in New Issue
Block a user