Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
git
提交
bbfc63dd
G
git
项目概览
李少辉-开发者
/
git
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
G
git
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
bbfc63dd
编写于
12月 27, 2006
作者:
J
Junio C Hamano
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
gcc does not necessarily pass runtime libpath with -R
Signed-off-by:
N
Junio C Hamano
<
junkio@cox.net
>
上级
7c20b823
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
16 addition
and
6 deletion
+16
-6
Makefile
Makefile
+16
-6
未找到文件。
Makefile
浏览文件 @
bbfc63dd
...
...
@@ -79,6 +79,10 @@ all:
#
# Define NO_ICONV if your libc does not properly support iconv.
#
# Define NO_R_TO_GCC if your gcc does not like "-R/path/lib" that
# tells runtime paths to dynamic libraries; "-Wl,-rpath=/path/lib"
# is used instead.
#
# Define USE_NSEC below if you want git to care about sub-second file mtimes
# and ctimes. Note that you need recent glibc (at least 2.2.4) for this, and
# it will BREAK YOUR LOCAL DIFFS! show-diff and anything using it will likely
...
...
@@ -422,11 +426,19 @@ ifeq ($(uname_S),Darwin)
endif
endif
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
ifndef
NO_CURL
ifdef
CURLDIR
# T
his is still problematic -- gcc does not always want -R
.
# T
ry "-Wl,-rpath=$(CURLDIR)/lib" in such a case
.
BASIC_CFLAGS
+=
-I
$(CURLDIR)
/include
CURL_LIBCURL
=
-L
$(CURLDIR)
/lib
-R
$(CURLDIR)
/lib
-lcurl
CURL_LIBCURL
=
-L
$(CURLDIR)
/lib
$(CC_LD_DYNPATH)
$(CURLDIR)
/lib
-lcurl
else
CURL_LIBCURL
=
-lcurl
endif
...
...
@@ -445,9 +457,8 @@ endif
ifndef
NO_OPENSSL
OPENSSL_LIBSSL
=
-lssl
ifdef
OPENSSLDIR
# Again this may be problematic -- gcc does not always want -R.
BASIC_CFLAGS
+=
-I
$(OPENSSLDIR)
/include
OPENSSL_LINK
=
-L
$(OPENSSLDIR)
/lib
-R
$(OPENSSLDIR)
/lib
OPENSSL_LINK
=
-L
$(OPENSSLDIR)
/lib
$(CC_LD_DYNPATH)
$(OPENSSLDIR)
/lib
else
OPENSSL_LINK
=
endif
...
...
@@ -463,9 +474,8 @@ else
endif
ifdef
NEEDS_LIBICONV
ifdef
ICONVDIR
# Again this may be problematic -- gcc does not always want -R.
BASIC_CFLAGS
+=
-I
$(ICONVDIR)
/include
ICONV_LINK
=
-L
$(ICONVDIR)
/lib
-R
$(ICONVDIR)
/lib
ICONV_LINK
=
-L
$(ICONVDIR)
/lib
$(CC_LD_DYNPATH)
$(ICONVDIR)
/lib
else
ICONV_LINK
=
endif
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录