undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'ab/deprecate-R-for-dynpath'

Browse Source 
The way of specifying the path to find dynamic libraries at runtime
has been simplified.  The old default to pass -R/path/to/dir has been
replaced with the new default to pass -Wl,-rpath,/path/to/dir,
which is the more recent GCC uses.  Those who need to build with an
old GCC can still use "CC_LD_DYNPATH=-R"

* ab/deprecate-R-for-dynpath:
  Makefile: remove the NO_R_TO_GCC_LINKER flag
This commit is contained in:
Junio C Hamano 2019-06-13 13:19:43 -07:00
commit 51d6c0f015
1 changed files with 1 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Makefile
View File

@ -265,10 +265,6 @@ all::
# #
# Define NO_DEFLATE_BOUND if your zlib does not have deflateBound. # Define NO_DEFLATE_BOUND if your zlib does not have deflateBound.
# #
# Define NO_R_TO_GCC_LINKER if your gcc does not like "-R/path/lib"
# that tells runtime paths to dynamic libraries;
# "-Wl,-rpath=/path/lib" is used instead.
#
# Define NO_NORETURN if using buggy versions of gcc 4.6+ and profile feedback, # Define NO_NORETURN if using buggy versions of gcc 4.6+ and profile feedback,
# as the compiler can crash (http://gcc.gnu.org/bugzilla/show_bug.cgi?id=49299) # as the compiler can crash (http://gcc.gnu.org/bugzilla/show_bug.cgi?id=49299)
# #
@ -1158,6 +1154,7 @@ endif
# which'll override these defaults. # which'll override these defaults.
CFLAGS = -g -O2 -Wall CFLAGS = -g -O2 -Wall
LDFLAGS = LDFLAGS =
CC_LD_DYNPATH = -Wl,-rpath,
BASIC_CFLAGS = -I. BASIC_CFLAGS = -I.
BASIC_LDFLAGS = BASIC_LDFLAGS =
@ -1288,16 +1285,6 @@ ifeq ($(uname_S),Darwin)
PTHREAD_LIBS = PTHREAD_LIBS =
endif endif
ifndef CC_LD_DYNPATH
ifdef NO_R_TO_GCC_LINKER
# Some gcc does not accept and pass -R to the linker to specify
# the runtime dynamic library path.
CC_LD_DYNPATH = -Wl,-rpath,
else
CC_LD_DYNPATH = -R
endif
endif
ifdef NO_LIBGEN_H ifdef NO_LIBGEN_H
COMPAT_CFLAGS += -DNO_LIBGEN_H COMPAT_CFLAGS += -DNO_LIBGEN_H
COMPAT_OBJS += compat/basename.o COMPAT_OBJS += compat/basename.o