summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: f1b8fd4)
raw | patch | inline | side by side (parent: f1b8fd4)
author | Junio C Hamano <junkio@cox.net> | |
Thu, 29 Jun 2006 05:08:54 +0000 (22:08 -0700) | ||
committer | Junio C Hamano <junkio@cox.net> | |
Mon, 3 Jul 2006 00:14:43 +0000 (17:14 -0700) |
On some platforms, Git.xs refuses to link with the rest of git
unless the latter is compiled with -fPIC, and we have USE_PIC
control in the Makefile for the user to set it. At least we
know x86-64 is such, so set it in the Makefile.
The original suggestion by Marco Roeland conservatively did this
only for Linux x86-64, but let's keep the Makefile simple and if
it breaks somebody let them holler.
Signed-off-by: Junio C Hamano <junkio@cox.net>
unless the latter is compiled with -fPIC, and we have USE_PIC
control in the Makefile for the user to set it. At least we
know x86-64 is such, so set it in the Makefile.
The original suggestion by Marco Roeland conservatively did this
only for Linux x86-64, but let's keep the Makefile simple and if
it breaks somebody let them holler.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Makefile | patch | blob | history |
diff --git a/Makefile b/Makefile
index 2f66ab114365ea3ccb3e4c28a4c3dfc9ea794636..3c25fb38bfcffb484938ece36c0924a42e3e1698 100644 (file)
--- a/Makefile
+++ b/Makefile
ifneq (,$(findstring arm,$(uname_M)))
ARM_SHA1 = YesPlease
endif
+ifeq ($(uname_M),x86_64)
+ USE_PIC = YesPlease
+endif
-include config.mak