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

[infinoid@xxxxxxxxxxxx]

Author: infinoid
Date: Mon Jul 28 10:02:56 2008
New Revision: 29829

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

Log:
[config] Apply patch from donaldh++ to fix cygwin builds
* undefined reference to `_Parrot_set_config_hash_internal'
(src/null_config.c has a dependency on libparrot but appears at the end of the 
link line.)


Modified: trunk/config/gen/makefiles/root.in
==============================================================================
--- trunk/config/gen/makefiles/root.in  (original)
+++ trunk/config/gen/makefiles/root.in  Mon Jul 28 10:02:56 2008
@@ -774,8 +774,8 @@
     lib/Parrot/OpLib/core.pm $(SRC_DIR)/parrot_config$(O) \
     $(MINIPARROT)
        $(LINK) @ld_out@$@ \
-    $(SRC_DIR)/main$(O) @rpath_blib@ $(ALL_PARROT_LIBS) $(LINKFLAGS) 
$(LINK_DYNAMIC) \
-    $(SRC_DIR)/parrot_config$(O)
+       $(SRC_DIR)/main$(O) $(SRC_DIR)/parrot_config$(O) \
+       @rpath_blib@ $(ALL_PARROT_LIBS) $(LINKFLAGS) $(LINK_DYNAMIC) \
 
 pbc_to_exe.pir : $(PARROT) tools/dev/pbc_to_exe_gen.pl
        $(PERL) tools/dev/pbc_to_exe_gen.pl \
@@ -802,8 +802,8 @@
 # TODO build the real miniparrot
 $(MINIPARROT) : $(SRC_DIR)/main$(O) $(GEN_HEADERS) $(LIBPARROT) \
     lib/Parrot/OpLib/core.pm $(SRC_DIR)/null_config$(O)
-       $(LINK) @ld_out@$@ $(SRC_DIR)/main$(O) \
-    @rpath_blib@ $(ALL_PARROT_LIBS) $(LINKFLAGS) $(SRC_DIR)/null_config$(O)
+       $(LINK) @ld_out@$@ $(SRC_DIR)/main$(O) $(SRC_DIR)/null_config$(O) \
+       @rpath_blib@ $(ALL_PARROT_LIBS) $(LINKFLAGS)
 
 $(INSTALLABLEPARROT) : $(SRC_DIR)/main$(O) $(GEN_HEADERS) $(LIBPARROT) \
     lib/Parrot/OpLib/core.pm $(SRC_DIR)/install_config$(O) \