mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-11-26 14:22:01 +00:00
More UNIX Lib fixes
This commit is contained in:
parent
87315ca884
commit
4c49e248d0
@ -27,6 +27,7 @@ ifeq ($(USE_PTHREADS),1)
|
||||
endif
|
||||
|
||||
DEFAULT_COMPILER = cc
|
||||
LINK_PROGRAM = $(CCC)
|
||||
|
||||
ifdef NS_USE_GCC
|
||||
CC = gcc
|
||||
|
@ -40,6 +40,8 @@ OPT_SLASH = /
|
||||
LIB_PREFIX = lib
|
||||
LIB_SUFFIX = .a
|
||||
NSPR_LIBS = plds21 plc21 nspr21 msgc21
|
||||
LINK_PROGRAM = $(CC)
|
||||
XP_REG_LIB = reg
|
||||
|
||||
####################################################################
|
||||
#
|
||||
|
@ -54,6 +54,7 @@ NSPR_LIBS = libplds21 libplc21 libnspr21 libmsgc21
|
||||
OPT_SLASH = /
|
||||
LIB_PREFIX =
|
||||
LIB_SUFFIX = .lib
|
||||
XP_REG_LIB = libreg$(MOZ_BITS)
|
||||
|
||||
|
||||
ifdef BUILD_OPT
|
||||
|
@ -226,7 +226,7 @@ else
|
||||
$(LINK_EXE) $(MAP) $(PDB) $(IMP) $(OBJS) $(OUT_NAME)$(PROGRAM) $(LDFLAGS) $(OS_LIBS) $(EXTRA_LIBS)
|
||||
endif
|
||||
else
|
||||
$(CC) -o $@ $(CFLAGS) $(OBJS) $(LDFLAGS) $(OS_LIBS)
|
||||
$(LINK_PROGRAM) -o $@ $(CFLAGS) $(OBJS) $(LDFLAGS) $(EXTRA_LIBS) $(OS_LIBS)
|
||||
endif
|
||||
|
||||
$(LIBRARY): $(OBJS)
|
||||
|
Loading…
Reference in New Issue
Block a user