Skip to content

Commit

Permalink
Properly define HAS_PERL6
Browse files Browse the repository at this point in the history
  • Loading branch information
leto committed Jun 25, 2010
1 parent 3058930 commit ab6a764
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
8 changes: 4 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -35,15 +35,15 @@ PARROT_IS_INSECURE = $(shell expr $(PARROTREVISION) \< $(MINPARROTREVISION))
# PGVER_MINOR = $(shell echo $(VERSION) | awk -F. '{ print ($$2 + 0) }')
# PGVER_PATCH = $(shell echo $(VERSION) | awk -F. '{ print ($$3 + 0) }')


override CPPFLAGS := -I$(PARROTINC) -I$(srcdir) $(CPPFLAGS)
override CFLAGS := $(PARROTLDFLAGS) $(PARROTLINKFLAGS) $(CFLAGS)

ifdef ($(PERL6PBC))
override CFLAGS := $(CFLAGS) -DHAS_PERL6 -D'PERL6PBC="$(PERL6PBC)"'
endif

# It would be nice if this ran before we compiled
all: check_revision headers
ifneq ($(PERL6PBC),)
override CFLAGS := $(CFLAGS) -DHAS_PERL6 -D'PERL6PBC="$(PERL6PBC)"'
endif
@echo "\n\n\tHappy Hacking with PL/Parrot!\n\n"

headers:
Expand Down
2 changes: 1 addition & 1 deletion plparrot.c
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ _PG_init(void)
trusted_interp = Parrot_new(untrusted_interp);

//Parrot_set_trace(interp, PARROT_ALL_TRACE_FLAGS);
#if HAS_PERL6
#ifdef HAS_PERL6
p6_interp = Parrot_new(trusted_interp);
p6u_interp = Parrot_new(untrusted_interp);
if (!p6_interp) {
Expand Down

0 comments on commit ab6a764

Please sign in to comment.