[svn:parrot] r43793 - branches/rm_cflags/config/gen/makefiles

coke at svn.parrot.org coke at svn.parrot.org
Tue Feb 9 05:43:37 UTC 2010


Author: coke
Date: Tue Feb  9 05:43:36 2010
New Revision: 43793
URL: https://trac.parrot.org/parrot/changeset/43793

Log:
restore 2 of the CFLAGS directives in the makefile itself.

Presumably this would actually be necessary only if !shared.

Modified:
   branches/rm_cflags/config/gen/makefiles/CFLAGS.in
   branches/rm_cflags/config/gen/makefiles/root.in

Modified: branches/rm_cflags/config/gen/makefiles/CFLAGS.in
==============================================================================
--- branches/rm_cflags/config/gen/makefiles/CFLAGS.in	Tue Feb  9 03:56:56 2010	(r43792)
+++ branches/rm_cflags/config/gen/makefiles/CFLAGS.in	Tue Feb  9 05:43:36 2010	(r43793)
@@ -21,11 +21,6 @@
 # io should be -Wunused clean
 {^src/io/}              s/-Wno-unused/-Wunused/
 
-# files which make their way into dynamically loaded files should be compiled
-# with shared library options
-src/extend.c        +{@cc_shared@}
-src/nci_test.c      +{@cc_shared@}
-
 # imcc file settings
 {^compilers/imcc/}            -{-Wwrite-strings -Wcast-qual}
 {^compilers/imcc/(?!imclexer)}      s/-Wno-unused/-Wunused/

Modified: branches/rm_cflags/config/gen/makefiles/root.in
==============================================================================
--- branches/rm_cflags/config/gen/makefiles/root.in	Tue Feb  9 03:56:56 2010	(r43792)
+++ branches/rm_cflags/config/gen/makefiles/root.in	Tue Feb  9 05:43:36 2010	(r43793)
@@ -579,6 +579,15 @@
 .pir.pbc : # suffix rule (limited support)
 	$(PARROT) -o $@ $<
 
+## Overrides of basic suffix rules:
+
+## files which make their way into dynamically loaded files should be compiled
+## with shared library options
+src/extend$(O) : src/extend.c
+	$(CC) $(CFLAGS) @cc_shared@ -I$(@D) @cc_o_out@$@ -c $<
+src/nci_test$(O) : src/nci_test.c
+	$(CC) $(CFLAGS) @cc_shared@ -I$(@D) @cc_o_out@$@ -c $<
+
 ###############################################################################
 #
 # USER TARGETS:


More information about the parrot-commits mailing list