Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-25 13:51:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

IRIX fixes

Browse Source
This commit is contained in:
spider 1998-06-02 02:30:39 +00:00
parent a2fd8036ca
commit ab9eb68139
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gconfig/rules.mk
View File

@ -233,10 +233,10 @@ ifeq ($(OS_TARGET),WIN16)
$(LINK) @w16link. $(LINK) @w16link.
rm w16link rm w16link
else else
$(LINK_EXE) $(MAP) $(PDB) $(IMP) $(OBJS) $(OUT_NAME)$(PROGRAM) $(LDFLAGS) $(OS_LIBS) $(LD_LIBS) $(EXTRA_LIBS) $(RESFILE) $(LINK_EXE) $(MAP) $(PDB) $(IMP) $(OBJS) $(OUT_NAME)$(PROGRAM) $(LDFLAGS) $(STATIC_LIBS) $(OS_LIBS) $(LD_LIBS) $(EXTRA_LIBS) $(RESFILE)
endif endif
else else
$(LINK_PROGRAM) -o $@ $(CFLAGS) $(OBJS) $(LDFLAGS) $(EXTRA_LIBS) $(LD_LIBS) $(OS_LIBS) $(LINK_PROGRAM) -o $@ $(CFLAGS) $(OBJS) $(LDFLAGS) $(STATIC_LIBS) $(LD_LIBS) $(EXTRA_LIBS) $(OS_LIBS)
endif endif
$(LIBRARY): $(OBJS) $(AR_LIBS) $(LIBRARY): $(OBJS) $(AR_LIBS)

10
gconfig/ruleset.mk
View File

@ -169,12 +169,20 @@ ifdef AR_LIBS
endif endif
endif endif
ifdef STATIC_LIBS
ifeq ($(OS_ARCH), WINNT)
STATIC_LIBS := $(addprefix $(CONFIG_DIST_LIB)$(OPT_SLASH), $(STATIC_LIBS:%=%$(ARCHIVE_SUFFIX)$(STATIC_LIB_SUFFIX)))
else
STATIC_LIBS := $(addprefix $(CONFIG_DIST_LIB)$(OPT_SLASH)lib, $(STATIC_LIBS:%=%_s$(ARCHIVE_SUFFIX)$(STATIC_LIB_SUFFIX)))
endif
endif
# Rules to convert LD_LIBS to platform-dependent naming scheme # Rules to convert LD_LIBS to platform-dependent naming scheme
ifdef LD_LIBS ifdef LD_LIBS
ifeq ($(OS_ARCH), WINNT) ifeq ($(OS_ARCH), WINNT)
LD_LIBS := $(addprefix $(CONFIG_DIST_LIB)$(OPT_SLASH), $(LD_LIBS:%=%$(STATIC_LIB_SUFFIX))) LD_LIBS := $(addprefix $(CONFIG_DIST_LIB)$(OPT_SLASH), $(LD_LIBS:%=%$(STATIC_LIB_SUFFIX)))
else else
LD_LIBS := $(addprefix $(CONFIG_DIST_BIN)$(OPT_SLASH)lib, $(LD_LIBS:%=%$(STATIC_LIB_SUFFIX))) LD_LIBS := $(addprefix $(DIST)$(OPT_SLASH)bin$(OPT_SLASH)lib, $(LD_LIBS:%=%.$(DLL_SUFFIX)))
endif endif
endif endif