mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-12-04 19:33:18 +00:00
r=cls, a=brendan I have no idea how I broke rules.mk like this but it has extra CR/LF
This commit is contained in:
parent
38ba5d81e9
commit
bce8f1804b
@ -559,10 +559,10 @@ alltags:
|
||||
$(PROGRAM): $(PROGOBJS) $(EXTRA_DEPS) Makefile Makefile.in
|
||||
ifeq ($(MOZ_OS2_TOOLS),VACPP)
|
||||
$(LD) -OUT:$@ $(LDFLAGS) $(OS_LFLAGS) $(PROGOBJS) $(LIBS) $(EXTRA_LIBS) -MAP:$(@:.exe=.map) $(OS_LIBS) /ST:0x1000000
|
||||
ifdef OS2_PROGRAM_RESOURCE
|
||||
rc -n -x2 -r $(OS2_PROGRAM_RESOURCE)
|
||||
rc -n -x2 $(patsubst %.rc,%.res,$(OS2_PROGRAM_RESOURCE)) $@
|
||||
endif # os2_prog_rsrc
|
||||
ifdef OS2_PROGRAM_RESOURCE
|
||||
rc -n -x2 -r $(OS2_PROGRAM_RESOURCE)
|
||||
rc -n -x2 $(patsubst %.rc,%.res,$(OS2_PROGRAM_RESOURCE)) $@
|
||||
endif # os2_prog_rsrc
|
||||
else
|
||||
ifeq ($(CPP_PROG_LINK),1)
|
||||
$(CCC) -o $@ $(CXXFLAGS) $(WRAP_MALLOC_CFLAGS) $(PROGOBJS) $(LDFLAGS) $(LIBS_DIR) $(LIBS) $(OS_LIBS) $(EXTRA_LIBS) $(BIN_FLAGS) $(WRAP_MALLOC_LIB)
|
||||
|
Loading…
Reference in New Issue
Block a user