Ticket #495: patch

tools/build/parrot_config_c.pl

@@ -92 +92 @@
 print << "EOF";
 }; /* parrot_config */
 
+PARROT_EXPORT
 void
 Parrot_set_config_hash(void)
 {

tools/dev/pbc_to_exe.pir

@@ -567 +567 @@
 
     $P0 = '_config'()
     .local string cc, link, link_dynamic, linkflags, ld_out, libparrot, libs, o
-    .local string rpath, osname, build_dir, slash, icushared
+    .local string rpath, osname, build_dir, slash, icushared, installed
     cc           = $P0['cc']
     link         = $P0['link']
     link_dynamic = $P0['link_dynamic']
@@ -581 +581 @@
     build_dir    = $P0['build_dir']
     slash        = $P0['slash']
     icushared    = $P0['icu_shared']
+    installed    = $P0['installed']
 
     .local string config, pathquote, exeprefix
     exeprefix = substr exefile, 0, 12
@@ -613 +614 @@
     link .= extra_obj
     link .= pathquote
   skip_extra_obj:
+    if installed == '1' goto config_object_is_in_library
     link .= ' '
     link .= config
+  config_object_is_in_library:
     link .= ' '
     link .= rpath
     link .= ' '

config/gen/makefiles/root.in

@@ -896 +896 @@
 #IF(win32):     if exist $@.manifest mt.exe -nologo -manifest $@.manifest -outputresource:$@;2
 #IF(libparrot_shared_alias):    ( cd @blib_dir@ ; ln -sf @libparrot_shared@ @libparrot_shared_alias@ )
 
+rebuild : $(O_FILES) $(SRC_DIR)/install_config$(O)
+        @echo Rebuild the Parrot library with including $(SRC_DIR)/install_config$(O) 
+        $(MKPATH) @blib_dir@
+        $(LD) $(LD_SHARE_FLAGS) $(LDFLAGS) @ld_out@$(LIBPARROT_SHARED) @libparrot_soname@ \
+#IF(cygwin):            -Wl,--out-implib=libparrot.dll.a \
+#IF(win32 and cc==gcc):         -Wl,--out-implib=libparrot.lib \
+                $(O_FILES) $(SRC_DIR)/install_config$(O) $(C_LIBS) $(ICU_SHARED)
+#IF(win32):     if exist $@.manifest mt.exe -nologo -manifest $@.manifest -outputresource:$@;2
+#IF(libparrot_shared_alias):    ( cd @blib_dir@ ; ln -sf @libparrot_shared@ @libparrot_shared_alias@ )
+
 
 $(INSTALLABLECONFIG) : $(SRC_DIR)/install_config$(O) $(PARROT_CONFIG) $(PBC_TO_EXE)
         $(PARROT) -o parrot_config.pbc tools/util/parrot-config.pir
         $(PBC_TO_EXE) parrot_config.pbc --install
 
-$(INSTALLABLEPBCTOEXE) : $(PBC_TO_EXE)
+$(INSTALLABLEPBCTOEXE) : $(PBC_TO_EXE) rebuild
         $(PBC_TO_EXE) pbc_to_exe.pbc --install
 
 #