Fix regression in Javascript configuration.
This commit is contained in:
parent
348cb2026e
commit
7e015e4acf
1 changed files with 3 additions and 3 deletions
|
|
@ -14,7 +14,7 @@
|
||||||
CC = @CC@
|
CC = @CC@
|
||||||
# HACK: under OSX a g++ compiled interpreter is seg-faulting when loading module libraries
|
# HACK: under OSX a g++ compiled interpreter is seg-faulting when loading module libraries
|
||||||
# with 'c++' it works... probably some missing flags?
|
# with 'c++' it works... probably some missing flags?
|
||||||
CXX = @JSINTERPRETERCXX@
|
JSCXX = @JSINTERPRETERCXX@
|
||||||
CFLAGS = @BOOST_CPPFLAGS@ @PLATFLAGS@
|
CFLAGS = @BOOST_CPPFLAGS@ @PLATFLAGS@
|
||||||
LINKFLAGS = @JSINTERPRETERLINKFLAGS@
|
LINKFLAGS = @JSINTERPRETERLINKFLAGS@
|
||||||
|
|
||||||
|
|
@ -47,10 +47,10 @@ JS_INTERPRETER_SRC = javascript.cxx js_shell.cxx $(JS_INTERPRETER_SRC_JSC) $(JS_
|
||||||
JS_INTERPRETER_OBJS = $(JS_INTERPRETER_SRC:.cxx=.o)
|
JS_INTERPRETER_OBJS = $(JS_INTERPRETER_SRC:.cxx=.o)
|
||||||
|
|
||||||
%.o: %.cxx
|
%.o: %.cxx
|
||||||
$(CXX) $(JS_INTERPRETER_DEFINES) -g $(JSINCLUDES) -o $@ -c $<
|
$(JSCXX) $(JS_INTERPRETER_DEFINES) -g $(JSINCLUDES) -o $@ -c $<
|
||||||
|
|
||||||
javascript: $(JS_INTERPRETER_OBJS)
|
javascript: $(JS_INTERPRETER_OBJS)
|
||||||
$(CXX) $(LINKFLAGS) $^ $(CFLAGS) -o javascript $(JSDYNAMICLINKING)
|
$(JSCXX) $^ $(CFLAGS) -o javascript $(JSDYNAMICLINKING) $(LINKFLAGS)
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
rm -f *.o
|
rm -f *.o
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue