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

[rurban at svn.parrot.org]

Author: rurban
Date: Mon Feb  2 20:57:01 2009
New Revision: 36300
URL: https://trac.parrot.org/parrot/changeset/36300

Log:
Fix TT #262, $linkflags missing for libnci_test.so and dynpmc
This broke 64bit builds with a 32bit perl, such as on opensolaris 10
--ccflags='-m64 -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_TS_ERRNO' --linkflags='-m64'
make
-  add @linkflags@ to Makefile, dynpmc.pl and dynoplibs.pl
(tested on cygwin, mingw, msvc6, gentoo-i386, solaris-64int)

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

Modified: trunk/config/gen/makefiles/dynoplibs_pl.in
==============================================================================
--- trunk/config/gen/makefiles/dynoplibs_pl.in	Mon Feb  2 20:34:56 2009	(r36299)
+++ trunk/config/gen/makefiles/dynoplibs_pl.in	Mon Feb  2 20:57:01 2009	(r36300)
@@ -24,7 +24,7 @@
 # Config stuff
 our $CC = q[@cc@ -c];
 our $LD = q[@ld@];
-our $LDFLAGS = q[@ldflags@ @ld_debug@ @rpath_blib@];
+our $LDFLAGS = q[@ldflags@ @ld_debug@ @rpath_blib@ @linkflags@];
 our $LD_LOAD_FLAGS = q[@ld_load_flags@];
 our $PERL = q[@perl@];
 our $LOAD_EXT = q[@load_ext@];

Modified: trunk/config/gen/makefiles/dynpmc_pl.in
==============================================================================
--- trunk/config/gen/makefiles/dynpmc_pl.in	Mon Feb  2 20:34:56 2009	(r36299)
+++ trunk/config/gen/makefiles/dynpmc_pl.in	Mon Feb  2 20:57:01 2009	(r36300)
@@ -28,7 +28,7 @@
 # Config stuff
 our $CC = q[@cc@ -c];
 our $LD = q[@ld@];
-our $LDFLAGS = q[@ldflags@ @ld_debug@ @rpath_blib@];
+our $LDFLAGS = q[@ldflags@ @ld_debug@ @rpath_blib@ @linkflags@];
 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	Mon Feb  2 20:34:56 2009	(r36299)
+++ trunk/config/gen/makefiles/root.in	Mon Feb  2 20:57:01 2009	(r36300)
@@ -2187,13 +2187,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)
+    @ld_out@$@ $(SRC_DIR)/nci_test$(O) $(C_LIBS) $(LINKFLAGS)
 
 # 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@
+    $(ALL_PARROT_LIBS) @opengl_lib@ $(LINKFLAGS)
 
 # emacs etags
 # this needs exuberant-ctags