[svn:parrot] r46634 - in trunk: config/gen/makefiles ext/nqp-rx
bacek at svn.parrot.org
bacek at svn.parrot.org
Sat May 15 02:12:37 UTC 2010
Author: bacek
Date: Sat May 15 02:12:37 2010
New Revision: 46634
URL: https://trac.parrot.org/parrot/changeset/46634
Log:
Fix build nqp-setting. bacek--
Modified:
trunk/config/gen/makefiles/root.in
trunk/ext/nqp-rx/Defines.mak
trunk/ext/nqp-rx/Rules.mak
Modified: trunk/config/gen/makefiles/root.in
==============================================================================
--- trunk/config/gen/makefiles/root.in Sat May 15 02:05:16 2010 (r46633)
+++ trunk/config/gen/makefiles/root.in Sat May 15 02:12:37 2010 (r46634)
@@ -1622,7 +1622,7 @@
###############################################################################
ext-clean:
- $(RM_RF) $(NQPRX_LIB_PBCS) parrot-nqp*
+ $(RM_RF) $(NQPRX_LIB_PBCS) $(NQPRX_LIB_SETTING) parrot-nqp*
###############################################################################
#
Modified: trunk/ext/nqp-rx/Defines.mak
==============================================================================
--- trunk/ext/nqp-rx/Defines.mak Sat May 15 02:05:16 2010 (r46633)
+++ trunk/ext/nqp-rx/Defines.mak Sat May 15 02:12:37 2010 (r46634)
@@ -3,7 +3,8 @@
$(LIBRARY_DIR)/HLL.pbc \
$(LIBRARY_DIR)/P6Regex.pbc \
$(LIBRARY_DIR)/nqp-rx.pbc \
- $(LIBRARY_DIR)/nqp-setting.pbc \
$(LIBRARY_DIR)/P6object.pbc \
$(LIBRARY_DIR)/PCT/HLLCompiler.pbc \
$(LIBRARY_DIR)/PCT/PAST.pbc
+
+NQPRX_LIB_SETTING = $(LIBRARY_DIR)/nqp-setting.pbc
Modified: trunk/ext/nqp-rx/Rules.mak
==============================================================================
--- trunk/ext/nqp-rx/Rules.mak Sat May 15 02:05:16 2010 (r46633)
+++ trunk/ext/nqp-rx/Rules.mak Sat May 15 02:12:37 2010 (r46634)
@@ -15,7 +15,7 @@
$(PARROT) -o $@ $(NQP_STAGE0_DIR)/NQP-s0.pir
## eventually nqp should be able to generate .pbc files directly
-$(LIBRARY_DIR)/nqp-setting.pbc: $(NQP_STAGE0_DIR)/nqp-setting.pm $(LIBRARY_DIR)/nqp-rx.pbc
+$(LIBRARY_DIR)/nqp-setting.pbc: $(NQP_STAGE0_DIR)/nqp-setting.pm $(LIBRARY_DIR)/nqp-rx.pbc $(NQPRX_LIB_PBCS)
$(PARROT) $(LIBRARY_DIR)/nqp-rx.pbc --target=pir -o $(NQP_STAGE0_DIR)/nqp-setting.pir $(NQP_STAGE0_DIR)/nqp-setting.pm
$(PARROT) -o $@ $(NQP_STAGE0_DIR)/nqp-setting.pir
More information about the parrot-commits
mailing list