From 4f4e1a286aff707161b4ac1346c872b809254781 Mon Sep 17 00:00:00 2001 From: su_v Date: Wed, 20 Aug 2014 03:18:14 +0200 Subject: osx-build.sh: don't hard-code LIBPREFIX, other minor changes (bzr r13506.1.7) --- packaging/macosx/osx-build.sh | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/packaging/macosx/osx-build.sh b/packaging/macosx/osx-build.sh index a536adf64..a3e87c0e7 100755 --- a/packaging/macosx/osx-build.sh +++ b/packaging/macosx/osx-build.sh @@ -22,9 +22,11 @@ # User modifiable parameters #---------------------------------------------------------- # Configure flags -CONFFLAGS="--disable-openmp --enable-osxapp" +CONFFLAGS="--enable-osxapp --enable-localinstall" # Libraries prefix (Warning: NO trailing slash) -LIBPREFIX="/opt/local-x11" +if [ -z "$LIBPREFIX" ]; then + LIBPREFIX="/opt/local-x11" +fi ############################################################ @@ -151,7 +153,7 @@ done # Set environment variables # ---------------------------------------------------------- -export LIBPREFIX="/opt/local-x11" +export LIBPREFIX # Specific environment variables # automake seach path @@ -160,8 +162,8 @@ export CPATH="$LIBPREFIX/include" export CPPFLAGS="-I$LIBPREFIX/include" export LDFLAGS="-L$LIBPREFIX/lib" # compiler arguments -export CFLAGS="-O0 -Wall" -export CXXFLAGS="$CFLAGS" +export CFLAGS="-pipe -Os" +export CXXFLAGS="$CFLAGS -Wno-cast-align" # Actions # ---------------------------------------------------------- -- cgit v1.2.3