diff options
author | unknown <msvensson@neptunus.(none)> | 2006-10-24 11:16:53 +0200 |
---|---|---|
committer | unknown <msvensson@neptunus.(none)> | 2006-10-24 11:16:53 +0200 |
commit | 375b04b9fe8826bd666b49421b5176a9316039e8 (patch) | |
tree | 57d5c62b20168f57a7f2174e2f74b71d4a42bf29 /netware | |
parent | 0b381c94cb262958fa672f00c308099b227c1fbe (diff) | |
download | mariadb-git-375b04b9fe8826bd666b49421b5176a9316039e8.tar.gz |
Temporary fixes for building from source dist in pushbuild
netware/BUILD/compile-netware-END:
If running as user pushbuild don't run autotools again
netware/BUILD/mwenv:
Set ARFLAGS to value of AR_FLAGS
Diffstat (limited to 'netware')
-rwxr-xr-x | netware/BUILD/compile-netware-END | 9 | ||||
-rwxr-xr-x | netware/BUILD/mwenv | 6 |
2 files changed, 13 insertions, 2 deletions
diff --git a/netware/BUILD/compile-netware-END b/netware/BUILD/compile-netware-END index a8d829499bd..6c531ab5c7c 100755 --- a/netware/BUILD/compile-netware-END +++ b/netware/BUILD/compile-netware-END @@ -18,8 +18,13 @@ rm -rf Makefile.in.bk # Setup Metrowerks environment . $path/mwenv -# Run autotools(use BUILD/autorun.sh) -. BUILD/autorun.sh +# Temporary hack to allow building from source dist +if [ ! "$USER"=pushbuild ] +then + # Run autotools(use BUILD/autorun.sh) + echo "Running autotools again(BUILD/autorun.sh)" + . BUILD/autorun.sh +fi # configure ./configure $base_configs $extra_configs diff --git a/netware/BUILD/mwenv b/netware/BUILD/mwenv index a60da17d987..a8d31949736 100755 --- a/netware/BUILD/mwenv +++ b/netware/BUILD/mwenv @@ -65,5 +65,11 @@ then export TERM=linux fi +# Temporary hack to allow building from source dist +if [ "$USER"=pushbuild ] +then + export ARFLAGS=$AR_FLAGS +fi + # Print all env. variables export |