Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
MariaDB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
8790b00c
Commit
8790b00c
authored
Jun 22, 2005
by
unknown
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Better AR guessing.
configure.in: Move AR guessing to misc.m4.
parent
6bd6b0db
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
30 additions
and
9 deletions
+30
-9
config/ac-macros/misc.m4
config/ac-macros/misc.m4
+29
-0
configure.in
configure.in
+1
-9
No files found.
config/ac-macros/misc.m4
View file @
8790b00c
...
@@ -737,3 +737,32 @@ then
...
@@ -737,3 +737,32 @@ then
fi
fi
AC_SUBST(CXX_VERSION)
AC_SUBST(CXX_VERSION)
])
])
AC_DEFUN([MYSQL_PROG_AR], [
AC_REQUIRE([MYSQL_CHECK_CXX_VERSION])
case $CXX_VERSION in
MIPSpro*)
AR=$CXX
ARFLAGS="-ar -o"
;;
*Forte*)
AR=$CXX
ARFLAGS="-xar -o"
;;
*)
if test -z "$AR"
then
AC_CHECK_PROG([AR], [ar], [ar])
fi
if test -z "$AR"
then
AC_MSG_ERROR([You need ar to build the library])
fi
if test -z "$ARFLAGS"
then
ARFLAGS="cru"
fi
esac
AC_SUBST(AR)
AC_SUBST(ARFLAGS)
])
configure.in
View file @
8790b00c
...
@@ -354,15 +354,7 @@ then
...
@@ -354,15 +354,7 @@ then
[
1],
[
Defined by configure. Use explicit template instantiation.]
)
[
1],
[
Defined by configure. Use explicit template instantiation.]
)
fi
fi
case
$CXX_VERSION
in
MYSQL_PROG_AR
MIPSpro
*
)
AR
=
$CXX
ARFLAGS
=
"-ar -o"
;;
*
Forte
*
)
AR
=
$CXX
ARFLAGS
=
"-xar -o"
esac
# Avoid bug in fcntl on some versions of linux
# Avoid bug in fcntl on some versions of linux
AC_MSG_CHECKING
(
"if we should use 'skip-locking' as default for
$target_os
"
)
AC_MSG_CHECKING
(
"if we should use 'skip-locking' as default for
$target_os
"
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment