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

allison at svn.parrot.org allison at svn.parrot.org
Sun Feb 8 18:40:39 UTC 2009


Author: allison
Date: Sun Feb  8 18:40:38 2009
New Revision: 36450
URL: https://trac.parrot.org/parrot/changeset/36450

Log:
[core] Reverting rejected TT #262.

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

Modified: trunk/config/gen/makefiles/dynpmc_pl.in
==============================================================================
--- trunk/config/gen/makefiles/dynpmc_pl.in	Sun Feb  8 17:47:31 2009	(r36449)
+++ trunk/config/gen/makefiles/dynpmc_pl.in	Sun Feb  8 18:40:38 2009	(r36450)
@@ -28,7 +28,7 @@
 # as Win32 paths have \'s in, which qq treats as escape sequences.
 our $CC              = q[@cc@ -c];
 our $LD              = q[@ld@];
-our $LDFLAGS         = q[@ldflags@ @ld_debug@ @rpath_blib@ @linkflags@];
+our $LDFLAGS         = q[@ldflags@ @ld_debug@ @rpath_blib@];
 our $LD_LOAD_FLAGS   = q[@ld_load_flags@];
 our $PERL            = q[@perl@];
 our $LOAD_EXT        = q[@load_ext@];

Modified: trunk/config/gen/makefiles/root.in
==============================================================================
--- trunk/config/gen/makefiles/root.in	Sun Feb  8 17:47:31 2009	(r36449)
+++ trunk/config/gen/makefiles/root.in	Sun Feb  8 18:40:38 2009	(r36450)
@@ -2164,13 +2164,13 @@
 # for use by t/pmc/nci.t
 $(LIBNCI_TEST_SO): $(SRC_DIR)/nci_test$(O)
 	$(LD) $(LD_LOAD_FLAGS) @ncilib_link_extra@ $(LDFLAGS) \
-    @ld_out@$@ $(SRC_DIR)/nci_test$(O) $(C_LIBS) $(LINKFLAGS)
+    @ld_out@$@ $(SRC_DIR)/nci_test$(O) $(C_LIBS)
 
 # for use by runtime/parrot/library/OpenGL.pir
 $(LIBGLUTCB_SO): $(LIBPARROT) $(SRC_DIR)/glut_callbacks$(O)
 	$(LD) $(LD_LOAD_FLAGS) $(LDFLAGS) \
     @ld_out@$@ $(SRC_DIR)/glut_callbacks$(O) \
-    $(ALL_PARROT_LIBS) @opengl_lib@ $(LINKFLAGS)
+    $(ALL_PARROT_LIBS) @opengl_lib@
 
 # emacs etags
 # this needs exuberant-ctags


More information about the parrot-commits mailing list