[svn:parrot] r49382 - trunk/config/gen/makefiles

plobsing at svn.parrot.org plobsing at svn.parrot.org
Wed Sep 29 12:16:35 UTC 2010


Author: plobsing
Date: Wed Sep 29 12:16:34 2010
New Revision: 49382
URL: https://trac.parrot.org/parrot/changeset/49382

Log:
avoid trying to build dynamic shared objects if we don't have dynamic linking

Modified:
   trunk/config/gen/makefiles/root.in

Modified: trunk/config/gen/makefiles/root.in
==============================================================================
--- trunk/config/gen/makefiles/root.in	Wed Sep 29 08:38:41 2010	(r49381)
+++ trunk/config/gen/makefiles/root.in	Wed Sep 29 12:16:34 2010	(r49382)
@@ -617,7 +617,7 @@
     corevm \
     docs \
 #IF(has_glut):    $(LIBGLUTCB_SO) \
-    $(EXTRANCITHUNKS_SO) \
+#IF(has_dynamic_linking): $(EXTRANCITHUNKS_SO) \
     $(DIS) \
     $(PARROT_CONFIG) \
     $(PBC_TO_EXE) \
@@ -630,9 +630,9 @@
     $(PCT_LIB_PBCS) \
     $(DATA_JSON_LIB_PBCS) \
     $(NQP_LIB_PBCS) \
+#IF(has_dynamic_linking): $(DYNOPLIBS_TARGETS) \
+#IF(has_dynamic_linking): $(LIBNCI_TEST_SO) \
     $(GEN_LIBRARY) \
-    $(DYNOPLIBS_TARGETS) \
-    $(LIBNCI_TEST_SO)
 
 # We build DYNPMC_TARGET in corevm. It's kinda hack to test t/pmc/threads.t CLONE_LIBRARIES
 corevm : \
@@ -641,7 +641,7 @@
     $(PARROT) \
     runtime/parrot/include/parrotlib.pbc \
     runtime/parrot/include/config.fpmc \
-    $(DYNPMC_TARGETS) \
+#IF(has_dynamic_linking): $(DYNPMC_TARGETS) \
     $(LIBRARY_DIR)/Test/More.pbc
 
 $(GEN_LIBRARY) : $(PARROT) $(GEN_PASM_INCLUDES)


More information about the parrot-commits mailing list