summaryrefslogtreecommitdiff
path: root/Build-tools
diff options
context:
space:
mode:
authorunknown <monty@hundin.mysql.fi>2002-03-25 18:10:34 +0200
committerunknown <monty@hundin.mysql.fi>2002-03-25 18:10:34 +0200
commit96cac2b451938ffceae819390cd4dc50b50965d5 (patch)
tree37e6dbff799fdd1e484007e0c2cec9bf3bbb073a /Build-tools
parent5485d4085d7335a13b65d587de5072004abe704a (diff)
downloadmariadb-git-96cac2b451938ffceae819390cd4dc50b50965d5.tar.gz
Fixed that RPM can be recompiled even if there is not another glibc in /usr/local/mysql-glibc
Build-tools/Do-compile: Fix to build mysqlcom Build-tools/Do-rpm: Fixes for building with gcc 3.0.4 Docs/manual.texi: Small bug fix configure.in: Cleanup
Diffstat (limited to 'Build-tools')
-rwxr-xr-xBuild-tools/Do-compile2
-rwxr-xr-xBuild-tools/Do-rpm2
2 files changed, 2 insertions, 2 deletions
diff --git a/Build-tools/Do-compile b/Build-tools/Do-compile
index 1e20cb35ed7..ffd8815fdb1 100755
--- a/Build-tools/Do-compile
+++ b/Build-tools/Do-compile
@@ -92,7 +92,7 @@ if ($opt_stage == 0)
{
system("mkdir $host") if (! -d $host);
system("touch $host/mysql-fix-for-glob");
- rm_all(<$host/mysql-*>);
+ rm_all(<$host/mysql*>);
system("mkdir $host/bin") if (! -d "$host/bin");
}
rm_all("$host/test");
diff --git a/Build-tools/Do-rpm b/Build-tools/Do-rpm
index 815eda86009..4072d575088 100755
--- a/Build-tools/Do-rpm
+++ b/Build-tools/Do-rpm
@@ -152,7 +152,7 @@ cat > $logdir/$TMP_SCRIPT_MYSQL <<END
set -x
# Check environment
-export MYSQL_BUILD_PATH="/usr/cygnus/redhat-980810/H-i386-pc-linux-gnu/bin/:/usr/bin:/bin"
+export MYSQL_BUILD_PATH="/usr/local/bin:/my/gnu/bin:/usr/bin:/bin"
export MYSQL_BUILD_CFLAGS="-O6 -fno-omit-frame-pointer -mpentium"
export MYSQL_BUILD_CXXFLAGS="-O6 -fno-omit-frame-pointer \
-felide-constructors -fno-exceptions -fno-rtti -mpentium"