Skip to content
Browse files

Fix build with Perl 5.12

This involved gutting our existing logic for guessing the path to libperl.so,
and replacing it with a direct perl interrogation call which has been available
since Perl 5.003007.
  • Loading branch information...
1 parent ef6f0be commit a89e71d83adafebd319e035ff1e371420ebe147a @sorear sorear committed Apr 23, 2010
Showing with 5 additions and 6 deletions.
  1. +5 −6 build/src/pmc/Makefile.in
View
11 build/src/pmc/Makefile.in
@@ -10,6 +10,9 @@ STAGING_DIR = ../../dynext
#INSTALL_DIR = $(LIB_DIR)/languages/blizkost/dynext
INSTALL_DIR = $(LIB_DIR)/dynext
+EMBLFLAGS := $(shell perl -MExtUtils::Embed -e ldopts)
+EMBCFLAGS := $(shell perl -MExtUtils::Embed -e ccopts)
+
# Set up extensions
LOAD_EXT = @load_ext@
O = @o@
@@ -24,22 +27,18 @@ CC = @cc@ -c
LD = @ld@
LDFLAGS = @ldflags@ @ld_debug@ @libs@
LD_LOAD_FLAGS = @ld_load_flags@
-CFLAGS = @ccflags@ @cc_shared@ @cc_debug@ @ccwarn@ @cc_hasjit@ @cg_flag@ @gc_flag@ -I"$(P5_ARCHLIB)/CORE"
+CFLAGS = @ccflags@ @cc_shared@ @cc_debug@ @ccwarn@ @cc_hasjit@ @cg_flag@ @gc_flag@ $(EMBCFLAGS)
CC_OUT = @cc_o_out@
LD_OUT = @ld_out@
LIBPARROT = @inst_libparrot_ldflags@
-LIBPERL = -lperl
-#IF(darwin):LIBPERL = $(P5_ARCHLIB)/CORE/$(P5_LIBPERL)
-#IF(win32):LIBPERL = $(P5_ARCHLIB)/CORE/$(P5_LIBPERL)
-
PMC2C_INCLUDES = --include $(SRC_DIR) --include $(SRC_DIR)/pmc
PMC2C = $(PERL) $(LIB_DIR)/tools/build/pmc2c.pl
PMC2CD = $(PMC2C) --dump $(PMC2C_INCLUDES)
PMC2CC = $(PMC2C) -c $(PMC2C_INCLUDES)
INCLUDES = -I$(INCLUDE_DIR) -I$(INCLUDE_DIR)/pmc
-LINKARGS = $(LDFLAGS) $(LD_LOAD_FLAGS) $(LIBPARROT) $(LIBPERL)
+LINKARGS = $(LDFLAGS) $(LD_LOAD_FLAGS) $(LIBPARROT) $(EMBLFLAGS)
BLIZKOST_GROUP = blizkost_group

0 comments on commit a89e71d

Please sign in to comment.
Something went wrong with that request. Please try again.