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
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
6bbeecc6
Commit
6bbeecc6
authored
21 years ago
by
guilhem@mysql.com
Browse files
Options
Browse Files
Download
Plain Diff
Merge gbichot@213.136.52.20:/home/bk/mysql-4.0
into mysql.com:/home/mysql_src/mysql-4.0
parents
5d097b43
319404ab
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
18 additions
and
2 deletions
+18
-2
BUILD/SETUP.sh
BUILD/SETUP.sh
+17
-1
configure.in
configure.in
+1
-1
No files found.
BUILD/SETUP.sh
View file @
6bbeecc6
...
@@ -71,6 +71,22 @@ else
...
@@ -71,6 +71,22 @@ else
make
=
make
make
=
make
fi
fi
if
test
-z
$CXX
;
then
if
test
-z
"
$CXX
"
;
then
CXX
=
gcc
CXX
=
gcc
fi
fi
# If ccache (a compiler cache which reduces build time)
# (http://samba.org/ccache) is installed, use it.
# We use 'grep' and hope 'grep' will work as expected
# (returns 0 if finds lines)
if
ccache
-V
>
/dev/null 2>&1
then
if
!
(
echo
"
$CC
"
|
grep
"ccache"
>
/dev/null
)
then
CC
=
"ccache
$CC
"
fi
if
!
(
echo
"
$CXX
"
|
grep
"ccache"
>
/dev/null
)
then
CXX
=
"ccache
$CXX
"
fi
fi
This diff is collapsed.
Click to expand it.
configure.in
View file @
6bbeecc6
...
@@ -361,7 +361,7 @@ then
...
@@ -361,7 +361,7 @@ then
# we will gets some problems when linking static programs.
# we will gets some problems when linking static programs.
# The following code is used to fix this problem.
# The following code is used to fix this problem.
if
test
"
$CXX
"
=
"gcc"
if
test
"
$CXX
"
=
"gcc"
-o
"
$CXX
"
=
"ccache gcc"
then
then
if
$CXX
-v
2>&1 |
grep
'version 3'
>
/dev/null 2>&1
if
$CXX
-v
2>&1 |
grep
'version 3'
>
/dev/null 2>&1
then
then
...
...
This diff is collapsed.
Click to expand it.
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