[darwinbuild-changes] [455] trunk
source_changes at macosforge.org
source_changes at macosforge.org
Wed Jan 7 19:28:34 PST 2009
Revision: 455
http://trac.macosforge.org/projects/darwinbuild/changeset/455
Author: wsiegrist at apple.com
Date: 2009-01-07 19:28:33 -0800 (Wed, 07 Jan 2009)
Log Message:
-----------
Use RC_CFLAGS instead of RC_ARCHS
Modified Paths:
--------------
trunk/common.mk
trunk/darwinbuild/Makefile
trunk/darwintrace/Makefile
trunk/darwinup/Makefile
trunk/darwinxref/Makefile
Modified: trunk/common.mk
===================================================================
--- trunk/common.mk 2009-01-08 03:23:31 UTC (rev 454)
+++ trunk/common.mk 2009-01-08 03:28:33 UTC (rev 455)
@@ -20,5 +20,6 @@
SED=/usr/bin/sed
-RC_ARCHS?=$(shell lipo -info /usr/lib/libSystem.dylib | cut -d : -f 3 | sed 's/ppc7400/ppc/' | awk '{ ORS=" "; for(i=1;i<=NF;i++) print "-arch", $$i}')
+RC_CFLAGS?=$(shell lipo -info /usr/lib/libSystem.dylib | cut -d : -f 3 | sed 's/ppc7400/ppc/' | awk '{ ORS=" "; for(i=1;i<=NF;i++) print "-arch", $$i}')
+CFLAGS+=$(RC_CFLAGS)
Modified: trunk/darwinbuild/Makefile
===================================================================
--- trunk/darwinbuild/Makefile 2009-01-08 03:23:31 UTC (rev 454)
+++ trunk/darwinbuild/Makefile 2009-01-08 03:28:33 UTC (rev 455)
@@ -14,7 +14,7 @@
all: manifest prefixes
manifest: manifest.c
- cc $(RC_ARCHS) -Wall -Werror -o $(OBJROOT)/$@ -lcrypto $^
+ cc $(CFLAGS) -Wall -Werror -o $(OBJROOT)/$@ -lcrypto $^
prefixes:
@$(foreach SCRIPT,$(PrefixReplacements), \
Modified: trunk/darwintrace/Makefile
===================================================================
--- trunk/darwintrace/Makefile 2009-01-08 03:23:31 UTC (rev 454)
+++ trunk/darwintrace/Makefile 2009-01-08 03:28:33 UTC (rev 455)
@@ -11,15 +11,15 @@
VERSION=$(shell uname -r | cut -f1 -d. )
ifeq ($(VERSION), 8)
-CFLAGS = -nostdlib
+CFLAGS += -nostdlib
else
-CFLAGS = -nodefaultlibs
+CFLAGS += -nodefaultlibs
endif
darwintrace.dylib: darwintrace.c
cc -o $(OBJROOT)/$@ \
- $(RC_ARCHS) \
- -g -Wall -Werror -pedantic -std=c99 \
+ $(CFLAGS) \
+ -Wall -Werror -pedantic -std=c99 \
-flat_namespace \
-fno-common \
$(CFLAGS) \
Modified: trunk/darwinup/Makefile
===================================================================
--- trunk/darwinup/Makefile 2009-01-08 03:23:31 UTC (rev 454)
+++ trunk/darwinup/Makefile 2009-01-08 03:28:33 UTC (rev 455)
@@ -1,6 +1,6 @@
include ../common.mk
-CXXFLAGS=-g -Wall -Werror -Wno-non-virtual-dtor $(RC_ARCHS)
+CXXFLAGS=-g -Wall -Werror -Wno-non-virtual-dtor $(CFLAGS)
# libredo.o is generated from cctools_ofiles
REDO=$(shell if [ -f /usr/local/lib/libredo_prebinding.a ]; then \
echo /usr/local/lib/libredo_prebinding.a ; else \
@@ -18,7 +18,7 @@
darwinup: Archive.o Depot.o Digest.o File.o SerialSet.o Utils.o main.o \
$(REDO)
- g++ $(RC_ARCHS) -lcrypto -lsqlite3 -o $@ $^
+ g++ $(CXXFLAGS) -lcrypto -lsqlite3 -o $@ $^
Archive.o: Archive.cpp Archive.h Depot.h File.h Utils.h
Depot.o: Depot.cpp Archive.h Depot.h File.h Utils.h
Modified: trunk/darwinxref/Makefile
===================================================================
--- trunk/darwinxref/Makefile 2009-01-08 03:23:31 UTC (rev 454)
+++ trunk/darwinxref/Makefile 2009-01-08 03:28:33 UTC (rev 455)
@@ -20,7 +20,6 @@
CFLAGS+= \
-DDEFAULT_DB_FILE=\".build/xref.db\" \
-DDEFAULT_PLUGIN_PATH=\"$(subst $(DESTDIR),,$(DATDIR))/plugins\" \
- $(RC_ARCHS)
### todo: --with-tcl-plugins configuration
TCL_CFLAGS=-DHAVE_TCL_PLUGINS=1
@@ -90,21 +89,21 @@
CMD="$(CC) $(CFLAGS) -c -o $(OBJROOT)/$${OFILE} $${CFILE}"; \
echo $$CMD ; $$CMD || exit 1 ; \
done
- $(CC) $(LDFLAGS) $(RC_ARCHS) -o $(SYMROOT)/darwinxref \
+ $(CC) $(LDFLAGS) $(CFLAGS) -o $(SYMROOT)/darwinxref \
$(SQLITELIB) \
$(foreach OFILE, $(SOURCES:.c=.o), $(OBJROOT)/$(notdir $(OFILE)))
$(DSYMUTIL) --out $(SYMROOT)/darwinxref.dSYM $(SYMROOT)/darwinxref || true
plugins/register.so: plugins/register.c DBPlugin.h
@mkdir -p $(OBJROOT)/plugins
- cc $(RC_ARCHS) -o $(OBJROOT)/$@ $(PLUGIN_CFLAGS) $(PLUGIN_LDFLAGS) $(SQLITEINC) $(SQLITELIB) -lcrypto $<
+ cc $(CFLAGS) -o $(OBJROOT)/$@ $(PLUGIN_CFLAGS) $(PLUGIN_LDFLAGS) $(SQLITEINC) $(SQLITELIB) -lcrypto $<
plugins/%.so: plugins/%.c DBPlugin.h
@mkdir -p $(OBJROOT)/plugins
- cc $(RC_ARCHS) -o $(OBJROOT)/$@ $(PLUGIN_CFLAGS) $(PLUGIN_LDFLAGS) $<
+ cc $(CFLAGS) -o $(OBJROOT)/$@ $(PLUGIN_CFLAGS) $(PLUGIN_LDFLAGS) $<
plugins-darwinports/%.so: plugins-darwinports/%.c DBPlugin.h
- cc $(RC_ARCHS) -o $(OBJROOT)/$@ $(PLUGIN_CFLAGS) $(PLUGIN_LDFLAGS) $<
+ cc $(CFLAGS) -o $(OBJROOT)/$@ $(PLUGIN_CFLAGS) $(PLUGIN_LDFLAGS) $<
apple_plugins:
@if [ -d plugins-apple ]; then \
@@ -117,5 +116,5 @@
fi
upgrade_plist: upgrade_plist.c cfutils.c
- cc $(RC_ARCHS) -o $(OBJROOT)/$@ $(CFLAGS) $(LDFLAGS) $^
+ cc $(CFLAGS) -o $(OBJROOT)/$@ $(CFLAGS) $(LDFLAGS) $^
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/darwinbuild-changes/attachments/20090107/5cf720db/attachment.html>
More information about the darwinbuild-changes
mailing list