diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-09-29 00:34:51 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-09-29 18:52:38 -0700 |
| commit | f7661ce0b8ee068e53d57249625199dda2829e30 (patch) | |
| tree | fd31822f80f8929d0bdd75e6e376c3cb9199dc05 | |
| parent | 18b0fc1ce1ef92716d4c5d5c7acd5d5a61a0a556 (diff) | |
| download | git-f7661ce0b8ee068e53d57249625199dda2829e30.tar.gz git-f7661ce0b8ee068e53d57249625199dda2829e30.tar.xz | |
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>
| -rw-r--r-- | INSTALL | 2 | ||||
| -rw-r--r-- | Makefile | 13 | ||||
| -rw-r--r-- | config.mak.in | 1 | ||||
| -rw-r--r-- | configure.ac | 7 |
4 files changed, 1 insertions, 22 deletions
@@ -48,7 +48,7 @@ Issues of note: GIT_EXEC_PATH=`pwd` PATH=`pwd`:$PATH - GITPERLLIB=`pwd`/perl/blib/lib:`pwd`/perl/blib/arch/auto/Git + GITPERLLIB=`pwd`/perl/blib/lib export GIT_EXEC_PATH PATH GITPERLLIB - Git is reasonably self-sufficient, but does depend on a few external @@ -60,9 +60,6 @@ all: # on non-x86 architectures (e.g. PowerPC), while the OpenSSL version (default # choice) has very fast version optimized for i586. # -# Define USE_PIC if you need the main git objects to be built with -fPIC -# in order to build and link perl/Git.so. x86-64 seems to need this. -# # Define NEEDS_SSL_WITH_CRYPTO if you need -lcrypto with -lssl (Darwin). # # 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') # CFLAGS and LDFLAGS are for the users to override from the command line. CFLAGS = -g -O2 -Wall -PIC_FLAG = -fPIC LDFLAGS = ALL_CFLAGS = $(CFLAGS) ALL_LDFLAGS = $(LDFLAGS) @@ -402,12 +398,6 @@ endif ifneq (,$(findstring arm,$(uname_M))) ARM_SHA1 = YesPlease endif -ifeq ($(uname_M),sun4u) - USE_PIC = YesPlease -endif -ifeq ($(uname_M),x86_64) - USE_PIC = YesPlease -endif -include config.mak.autogen -include config.mak @@ -546,9 +536,6 @@ else endif endif endif -ifdef USE_PIC - ALL_CFLAGS += $(PIC_FLAG) -endif ifdef NO_ACCURATE_DIFF BASIC_CFLAGS += -DNO_ACCURATE_DIFF endif diff --git a/config.mak.in b/config.mak.in index addda4f16..fecae802d 100644 --- a/config.mak.in +++ b/config.mak.in @@ -3,7 +3,6 @@ CC = @CC@ CFLAGS = @CFLAGS@ -PIC_FLAG = @PIC_FLAG@ AR = @AR@ TAR = @TAR@ #INSTALL = @INSTALL@ # needs install-sh or install.sh in sources diff --git a/configure.ac b/configure.ac index 0f93f6fe2..819282691 100644 --- a/configure.ac +++ b/configure.ac @@ -96,13 +96,6 @@ AC_SUBST(PYTHON_PATH) AC_MSG_NOTICE([CHECKS for programs]) # AC_PROG_CC([cc gcc]) -if test -n "$GCC"; then - PIC_FLAG="-fPIC" -else - AC_CHECK_DECL(__SUNPRO_C, [CFLAGS="$CFLAGS -xO3"; PIC_FLAG="-KPIC"]) -fi -AC_SUBST(PIC_FLAG) - #AC_PROG_INSTALL # needs install-sh or install.sh in sources AC_CHECK_TOOL(AR, ar, :) AC_CHECK_PROGS(TAR, [gtar tar]) |