Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
6
66
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Eric Vidal
66
Commits
4929c6f2
Commit
4929c6f2
authored
5 years ago
by
Eric Vidal
Browse files
Options
Downloads
Patches
Plain Diff
remove pkg_config,change flag at tryldflag function
parent
9875fad5
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
configure
+8
-8
8 additions, 8 deletions
configure
with
8 additions
and
8 deletions
configure
+
8
−
8
View file @
4929c6f2
...
...
@@ -133,7 +133,7 @@ tryflag () {
tryldflag
()
{
echo
"Checking whether linker accepts
$2
..."
echo
"typedef int x;"
>
"
$tmpc
"
if
$CC_AUTO
$CFLAGS_AUTO
$CFLAGS
$CFLAGS_POST
$
LD
FLAGS_AUTO
$
LD
FLAGS
$
LD
FLAGS_POST
-nostdlib
"
$2
"
-o
/dev/null
"
$tmpc
"
>
/dev/null 2>&1
;
then
if
$CC_AUTO
$C
PP
FLAGS_AUTO
$C
PP
FLAGS
$C
PP
FLAGS_POST
$
C
FLAGS_AUTO
$
C
FLAGS
$
C
FLAGS_POST
"
$2
"
-c
-o
/dev/null
"
$tmpc
"
>
/dev/null 2>&1
;
then
echo
" ... yes"
eval
"
$1
=
\"\$
{
$1
}
\$
2
\"
"
eval
"
$1
=
\$
{
$1
# }"
...
...
@@ -423,11 +423,11 @@ if [ "x$target" != "x$(cat $sysdeps/target)" ] ; then
exit
1
fi
if
!
test
-z
"
$PKG_CONFIG
"
&&
command
-v
$PKG_CONFIG
>
/dev/null
;
then
pkg_config
=
$PKG_CONFIG
else
pkg_config
=
${
cross
}
pkg-config
fi
#
if ! test -z "$PKG_CONFIG" && command -v $PKG_CONFIG > /dev/null ; then
#
pkg_config=$PKG_CONFIG
#
else
#
pkg_config=${cross}pkg-config
#
fi
spawn_lib
=
$(
cat
$sysdeps
/spawn.lib
)
socket_lib
=
$(
cat
$sysdeps
/socket.lib
)
...
...
@@ -530,7 +530,7 @@ SYSCLOCK_LIB := ${sysclock_lib}
TIMER_LIB :=
${
timer_lib
}
UTIL_LIB :=
${
util_lib
}
CC :=
$
{
CC_AUTO
}
CC :=
$CC_AUTO
CPPFLAGS_AUTO :=
$CPPFLAGS_AUTO
CPPFLAGS :=
$CPPFLAGS
$CPPFLAGS_POST
CFLAGS_AUTO :=
$CFLAGS_AUTO
...
...
@@ -539,7 +539,7 @@ LDFLAGS_AUTO := $LDFLAGS_AUTO
LDFLAGS :=
$LDFLAGS
$LDFLAGS_POST
LDFLAGS_SHARED :=
$LDFLAGS_SHARED
LDFLAGS_NOSHARED :=
$LDFLAGS_NOSHARED
CROSS_COMPILE :=
$
{
cross
}
CROSS_COMPILE :=
$cross
vpath lib%.a
$vpaths
vpath lib%.so
$vpathd
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment