Author: Armin Rigo <ar...@tunes.org>
Branch:
Changeset: r48210:9f869e457c00
Date: 2011-10-18 16:51 +0200
http://bitbucket.org/pypy/pypy/changeset/9f869e457c00/
Log: merge heads
diff --git a/pypy/translator/platform/posix.py
b/pypy/translator/platform/posix.py
--- a/pypy/translator/platform/posix.py
+++ b/pypy/translator/platform/posix.py
@@ -157,7 +157,7 @@
rules = [
('all', '$(DEFAULT_TARGET)', []),
- ('$(TARGET)', '$(OBJECTS)', '$(CC_LINK) $(LDFLAGS) $(LDFLAGSEXTRA)
-o $@ $(OBJECTS) $(LIBDIRS) $(LIBS) $(LINKFILES)'),
+ ('$(TARGET)', '$(OBJECTS)', '$(CC_LINK) $(LDFLAGSEXTRA) -o $@
$(OBJECTS) $(LIBDIRS) $(LIBS) $(LINKFILES) $(LDFLAGS)'),
('%.o', '%.c', '$(CC) $(CFLAGS) $(CFLAGSEXTRA) -o $@ -c $<
$(INCLUDEDIRS)'),
]
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
http://mail.python.org/mailman/listinfo/pypy-commit
