Skip to content

Commit

Permalink
Remove -fPIC which was only needed for Git.xs
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Junio C Hamano committed Sep 30, 2006
1 parent 18b0fc1 commit f7661ce
Show file tree
Hide file tree
Showing 4 changed files with 1 addition and 22 deletions.
2 changes: 1 addition & 1 deletion INSTALL
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
13 changes: 0 additions & 13 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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).
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion config.mak.in
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 0 additions & 7 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -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])
Expand Down

0 comments on commit f7661ce

Please sign in to comment.