Remove -fPIC which was only needed for Git.xs
The distinction between BASIC_ vs ALL_ is still kept, since it is not Git.xs specific -- we could face the same issue when we do other language bindings (e.g. Python). Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano committed
Sep 29, 2006 at 00:34 UTC
f7661ce0b8ee068e53d57249625199dda2829e30
4 files changed
+1
-22
INSTALL
+1
-1
@@ -48,7 +48,7 @@ Issues of note:
48
49
GIT_EXEC_PATH=`pwd`
50
PATH=`pwd`:$PATH
51
- GITPERLLIB=`pwd`/perl/blib/lib:`pwd`/perl/blib/arch/auto/Git
51
+ GITPERLLIB=`pwd`/perl/blib/lib
52
export GIT_EXEC_PATH PATH GITPERLLIB
53
54
- Git is reasonably self-sufficient, but does depend on a few external
Makefile
-13
@@ -60,9 +60,6 @@ all:
60
# on non-x86 architectures (e.g. PowerPC), while the OpenSSL version (default
61
# choice) has very fast version optimized for i586.
62
#
63
-# Define USE_PIC if you need the main git objects to be built with -fPIC
64
-# in order to build and link perl/Git.so. x86-64 seems to need this.
65
-#
63
# Define NEEDS_SSL_WITH_CRYPTO if you need -lcrypto with -lssl (Darwin).
64
#
65
# Define NEEDS_LIBICONV if linking with libc is not enough (Darwin).
@@ -112,7 +109,6 @@ uname_P := $(shell sh -c 'uname -p 2>/dev/null || echo not')
109
# CFLAGS and LDFLAGS are for the users to override from the command line.
110
111
CFLAGS = -g -O2 -Wall
115
-PIC_FLAG = -fPIC
112
LDFLAGS =
113
ALL_CFLAGS = $(CFLAGS)
114
ALL_LDFLAGS = $(LDFLAGS)
@@ -402,12 +398,6 @@ endif
398
ifneq (,$(findstring arm,$(uname_M)))
399
ARM_SHA1 = YesPlease
400
endif
405
-ifeq ($(uname_M),sun4u)
406
- USE_PIC = YesPlease
407
-endif
408
-ifeq ($(uname_M),x86_64)
409
- USE_PIC = YesPlease
410
-endif
401
402
-include config.mak.autogen
403
-include config.mak
@@ -546,9 +536,6 @@ else
536
endif
537
endif
538
endif
549
-ifdef USE_PIC
550
- ALL_CFLAGS += $(PIC_FLAG)
551
-endif
539
ifdef NO_ACCURATE_DIFF
540
BASIC_CFLAGS += -DNO_ACCURATE_DIFF
541
endif
config.mak.in
-1
@@ -3,7 +3,6 @@
3
4
CC = @CC@
5
CFLAGS = @CFLAGS@
6
-PIC_FLAG = @PIC_FLAG@
6
AR = @AR@
7
TAR = @TAR@
8
#INSTALL = @INSTALL@ # needs install-sh or install.sh in sources
configure.ac
-7
@@ -96,13 +96,6 @@ AC_SUBST(PYTHON_PATH)
96
AC_MSG_NOTICE([CHECKS for programs])
97
#
98
AC_PROG_CC([cc gcc])
99
-if test -n "$GCC"; then
100
- PIC_FLAG="-fPIC"
101
-else
102
- AC_CHECK_DECL(__SUNPRO_C, [CFLAGS="$CFLAGS -xO3"; PIC_FLAG="-KPIC"])
103
-fi
104
-AC_SUBST(PIC_FLAG)
105
-
99
#AC_PROG_INSTALL # needs install-sh or install.sh in sources
100
AC_CHECK_TOOL(AR, ar, :)
101
AC_CHECK_PROGS(TAR, [gtar tar])