mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-23 02:05:42 +00:00
Bug 366355: perlconnect removal continues, r=mrbkap, patch by Patrick Welche <pw-fb@newn.cam.ac.uk>
This commit is contained in:
parent
3e8041360d
commit
dc97191b2e
@ -100,25 +100,6 @@ CFLAGS += -fp:precise
|
||||
endif
|
||||
endif # WINNT
|
||||
|
||||
#
|
||||
# Ask perl what flags it was built with, so we can build js with similar flags
|
||||
# and link properly. Viva gmake.
|
||||
#
|
||||
ifdef JS_PERLCONNECT
|
||||
DEFINES += -DPERLCONNECT -D_GNU_SOURCE
|
||||
|
||||
PERLCFLAGS := $(shell perl -MExtUtils::Embed -e ccopts)
|
||||
PERLLDFLAGS := $(shell perl -MExtUtils::Embed -e ldopts)
|
||||
|
||||
# perl erroneously reports compiler flag -rdynamic (interpreted by ld
|
||||
# as -r) when it really meant -export-dynamic.
|
||||
PERLLDFLAGS := $(subst -rdynamic,-export-dynamic,$(PERLLDFLAGS))
|
||||
|
||||
CFLAGS += $(PERLCFLAGS)
|
||||
#LDFLAGS += $(PERLLDFLAGS) #PH removed this assgnment
|
||||
INCLUDES += -I. #needed for perlconnect/jsperl.c
|
||||
endif
|
||||
|
||||
#
|
||||
# Server-related changes :
|
||||
#
|
||||
@ -259,10 +240,6 @@ ifdef JS_LIVECONNECT
|
||||
DIRS += liveconnect
|
||||
endif
|
||||
|
||||
ifdef JS_PERLCONNECT
|
||||
JS_CFILES += perlconnect/jsperl.c
|
||||
endif
|
||||
|
||||
ifdef JS_HAS_FILE_OBJECT
|
||||
JS_CFILES += jsfile.c
|
||||
JS_HFILES += jsfile.h
|
||||
@ -280,9 +257,6 @@ else
|
||||
LIBRARY = $(OBJDIR)/libjs.a
|
||||
SHARED_LIBRARY = $(OBJDIR)/libjs.$(SO_SUFFIX)
|
||||
PROGRAM = $(OBJDIR)/js
|
||||
ifdef JS_PERLCONNECT
|
||||
PROG_LIBS += $(PERLLDFLAGS)
|
||||
endif
|
||||
endif
|
||||
|
||||
include rules.mk
|
||||
|
@ -64,10 +64,6 @@
|
||||
#include "jsscope.h"
|
||||
#include "jsscript.h"
|
||||
|
||||
#ifdef PERLCONNECT
|
||||
#include "perlconnect/jsperl.h"
|
||||
#endif
|
||||
|
||||
#ifdef LIVECONNECT
|
||||
#include "jsjava.h"
|
||||
#endif
|
||||
@ -3198,11 +3194,6 @@ main(int argc, char **argv, char **envp)
|
||||
if (!JS_DefineFunctions(cx, it, its_methods))
|
||||
return 1;
|
||||
|
||||
#ifdef PERLCONNECT
|
||||
if (!JS_InitPerlClass(cx, glob))
|
||||
return 1;
|
||||
#endif
|
||||
|
||||
#ifdef JSDEBUGGER
|
||||
/*
|
||||
* XXX A command line option to enable debugging (or not) would be good
|
||||
|
Loading…
Reference in New Issue
Block a user