aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Tatham <anakin@pobox.com>2010-04-26 17:26:38 +0000
committerSimon Tatham <anakin@pobox.com>2010-04-26 17:26:38 +0000
commit177f4c1974f83085953d13f5f3a54d8798f97335 (patch)
tree48004c31ef845c1f1e89dc7ddfb5a5a0349f1717
parent36cee4e2796c23da15d3276e88416ad1ce035c4a (diff)
downloadpuzzles-177f4c1974f83085953d13f5f3a54d8798f97335.zip
puzzles-177f4c1974f83085953d13f5f3a54d8798f97335.tar.gz
puzzles-177f4c1974f83085953d13f5f3a54d8798f97335.tar.bz2
puzzles-177f4c1974f83085953d13f5f3a54d8798f97335.tar.xz
Fix a build-breaking bug I introduced to the OS X makefile in r8931.
(Missed off the explicit -o from the compile lines constructing version.{i386,ppc}.o, causing both to be compiled as version.o and dependent build steps to fail.) [originally from svn r8933] [r8931 == 36cee4e2796c23da15d3276e88416ad1ce035c4a]
-rw-r--r--Recipe4
1 files changed, 2 insertions, 2 deletions
diff --git a/Recipe b/Recipe
index e57e7cd..7907a2e 100644
--- a/Recipe
+++ b/Recipe
@@ -152,9 +152,9 @@ version2.def: FORCE
# generates _nearly_ the same output, but it has no check function.
!begin osx
version.ppc.o: version.c version2.def
- $(CC) -arch ppc $(COMPAT) $(XFLAGS) $(CFLAGS) `cat version2.def` -c version.c
+ $(CC) -arch ppc $(COMPAT) $(XFLAGS) $(CFLAGS) `cat version2.def` -c version.c -o $@
version.i386.o: version.c version2.def
- $(CC) -arch i386 $(COMPAT) $(XFLAGS) $(CFLAGS) `cat version2.def` -c version.c
+ $(CC) -arch i386 $(COMPAT) $(XFLAGS) $(CFLAGS) `cat version2.def` -c version.c -o $@
version2.def: FORCE
if test -z "$(VER)" && test -f manifest && (md5 -r `awk '{print $$2}' manifest` | diff -w manifest -); then \
cat version.def > version2.def.new; \