diff options
| author | Nick Mathewson <nickm@torproject.org> | 2009-10-14 21:30:53 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2009-10-14 21:30:53 -0400 |
| commit | a1ab3bb410d58c1364f686bf908601588b6f68c5 (patch) | |
| tree | ac61849af973810e12f3afb56ea1ceb7c958e451 | |
| parent | 23943364263b8cb38e81a63715f872691269d5ed (diff) | |
| parent | ca5e41afd7e3cb164b7c3ac99c8a338a121f682f (diff) | |
| download | tor-a1ab3bb410d58c1364f686bf908601588b6f68c5.tar.gz tor-a1ab3bb410d58c1364f686bf908601588b6f68c5.zip | |
Merge commit 'phobos/polipo-updates-maint-0.2.1' into maint-0.2.1
| -rw-r--r-- | contrib/polipo/Makefile.osx | 10 | ||||
| -rw-r--r-- | contrib/polipo/README | 2 |
2 files changed, 9 insertions, 3 deletions
diff --git a/contrib/polipo/Makefile.osx b/contrib/polipo/Makefile.osx index 8e748e2adb..55ed1c62f8 100644 --- a/contrib/polipo/Makefile.osx +++ b/contrib/polipo/Makefile.osx @@ -30,9 +30,13 @@ FILE_DEFINES = -DLOCAL_ROOT=\"$(LOCAL_ROOT)/\" \ DEFINES = $(FILE_DEFINES) $(PLATFORM_DEFINES) -UNIVERSAL = -O -g -mmacosx-version-min=10.4 -isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch i386 -arch ppc -LDFLAGS = -Wl,-syslibroot,/Developer/SDKs/MacOSX10.4u.sdk -CFLAGS = $(MD5INCLUDES) $(CDEBUGFLAGS) $(DEFINES) $(EXTRA_DEFINES) $(UNIVERSAL) +# Uncomment the UNIVERSAL, LDFLAGS, CFLAGS lines if you want universal binaries, otherwise +# you'll produce a binary only for your architecture and version of OSX +# UNIVERSAL = -O -g -mmacosx-version-min=10.4 -isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch i386 -arch ppc +# LDFLAGS = -Wl,-syslibroot,/Developer/SDKs/MacOSX10.4u.sdk +# CFLAGS = $(MD5INCLUDES) $(CDEBUGFLAGS) $(DEFINES) $(EXTRA_DEFINES) $(UNIVERSAL) +# If you uncommented the above CFLAGS, remove this next one. +CFLAGS = $(MD5INCLUDES) $(CDEBUGFLAGS) $(DEFINES) $(EXTRA_DEFINES) SRCS = util.c event.c io.c chunk.c atom.c object.c log.c diskcache.c main.c \ config.c local.c http.c client.c server.c auth.c tunnel.c \ diff --git a/contrib/polipo/README b/contrib/polipo/README index 038e354413..e05ab0ceec 100644 --- a/contrib/polipo/README +++ b/contrib/polipo/README @@ -1,4 +1,6 @@ Copyright 2007-2008 Andrew Lewman +Copyright 2009 The Tor Project + ---------------- General Comments ---------------- |