@@ -21,6 +21,7 @@ LDFLAGS = @ldflags@ @ld_debug@
21
21
LD_LOAD_FLAGS = @ld_load_flags@
22
22
LIBPARROT = @inst_libparrot_ldflags@
23
23
O = @o@
24
+ A = @a@
24
25
LOAD_EXT = @load_ext@
25
26
PERL = @perl@
26
27
CP = @cp@
@@ -447,6 +448,13 @@ LIBTOMMATH_SOURCE = 3rdparty/libtommath/bncore.c \
447
448
BIGINT_OPS = nqp_bigint_ops
448
449
BIGINT_OPS_SOURCE = nqp_bigint.ops
449
450
451
+ DYNCALL_BIN = 3rdparty/dyncall-0.6/dyncall/libdyncall_s$(A ) \
452
+ 3rdparty/dyncall-0.6/dyncallback/libdyncallback_s$(A ) \
453
+ 3rdparty/dyncall-0.6/dynload/libdynload_s$(A )
454
+
455
+ DYNCALL_OPS = nqp_dyncall_ops
456
+ DYNCALL_OPS_SOURCE = nqp_dyncall.ops
457
+
450
458
CLEANUPS = \
451
459
*.manifest \
452
460
*.pdb \
@@ -658,7 +666,7 @@ $(NCI_PBC): $(NQP_EXE)
658
666
./$(NQP_EXE ) --target=pir --output=src/gen/CallBuilder.pir $(NCI_SOURCE )
659
667
$(PARROT ) -o $(NCI_PBC ) src/gen/CallBuilder.pir
660
668
661
- $(DYNEXT_TARGET ) : $(DYNPMC ) $(DYNOPS ) $(OPS_DIR ) /$(BIGINT_OPS )$(LOAD_EXT )
669
+ $(DYNEXT_TARGET ) : $(DYNPMC ) $(DYNOPS ) $(OPS_DIR ) /$(BIGINT_OPS )$(LOAD_EXT ) $( OPS_DIR ) / $( DYNCALL_OPS )$( LOAD_EXT )
662
670
$(CP ) $(DYNPMC ) $(DYNEXT_DIR )
663
671
$(CP ) $(DYNOPS ) $(DYNEXT_DIR )
664
672
$(CP ) $(OPS_DIR ) /$(BIGINT_OPS )$(LOAD_EXT ) $(DYNEXT_DIR )
@@ -940,6 +948,14 @@ $(OPS_DIR)/$(BIGINT_OPS)$(LOAD_EXT): $(OPS_DIR)/$(BIGINT_OPS_SOURCE) $(LIBTOMMAT
940
948
cd src/6model/reprs && $(CC ) -c @cc_o_out@P6bigint$(O ) -I../../../$(PMC_DIR ) -I../../../3rdparty/libtommath $(CINCLUDES ) $(CFLAGS ) P6bigint.c
941
949
cd $(OPS_DIR ) && $(LD ) @ld_out@$(BIGINT_OPS )$(LOAD_EXT ) $(BIGINT_OPS )$(O ) ../../3rdparty/libtommath/* $(O ) ../6model/reprs/P6bigint$(O ) $(LINKARGS )
942
950
951
+ $(DYNCALL_BIN ) :
952
+ @dyncall_build@
953
+
954
+ $(OPS_DIR ) /$(DYNCALL_OPS )$(LOAD_EXT ) : $(OPS_DIR ) /$(DYNCALL_OPS_SOURCE ) $(DYNCALL_BIN )
955
+ cd $(OPS_DIR ) && $(OPS2C ) C --dynamic $(DYNCALL_OPS_SOURCE )
956
+ cd $(OPS_DIR ) && $(CC ) -c @cc_o_out@$(DYNCALL_OPS )$(O ) $(CINCLUDES ) -I../../3rdparty/dyncall-0.6 $(CFLAGS ) $(DYNCALL_OPS ) .c
957
+ cd $(OPS_DIR ) && $(LD ) @ld_out@$(DYNCALL_OPS )$(LOAD_EXT ) $(DYNCALL_OPS )$(O ) ../../3rdparty/dyncall-0.6/dyncall/libdyncall_s$(A ) ../../3rdparty/dyncall-0.6/dyncallback/libdyncallback_s$(A ) ../../3rdparty/dyncall-0.6/dynload/libdynload_s$(A ) $(LINKARGS )
958
+
943
959
bootstrap-files : $(STAGE2_PBCS ) src/stage2/$(CORE_SETTING_NQP )
944
960
$(PERL ) tools/build/gen-bootstrap.pl src/Regex.pir > src/stage0/Regex-s0.pir
945
961
$(PERL ) tools/build/gen-bootstrap.pl src/stage2/$(HLL_COMBINED_PIR ) > src/stage0/HLL-s0.pir
0 commit comments