Merge branch 'jc/gitpm' into next

* jc/gitpm:
  Remove -fPIC which was only needed for Git.xs
This commit is contained in:
Junio C Hamano
2006-09-29 18:52:55 -07:00
4 changed files with 1 additions and 22 deletions

View File

@@ -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

View File

@@ -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).
@@ -110,7 +107,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)
@@ -420,12 +416,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
@@ -567,9 +557,6 @@ else
endif
endif
endif
ifdef USE_PIC
ALL_CFLAGS += $(PIC_FLAG)
endif
ifdef NO_ACCURATE_DIFF
BASIC_CFLAGS += -DNO_ACCURATE_DIFF
endif

View File

@@ -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

View File

@@ -95,13 +95,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])