summaryrefslogtreecommitdiff
path: root/lib/build.sh
diff options
context:
space:
mode:
authorJohn Wiegley <johnw@newartisans.com>2012-07-30 23:22:42 -0500
committerJohn Wiegley <johnw@newartisans.com>2012-07-30 23:24:04 -0500
commit14ab4f7775fe203e6e5cd2b9cb4d364c465c4e4e (patch)
tree50c8ebbffd4682e055ddd215421bd36c2db8c789 /lib/build.sh
parent39ce225004e88d397ca3fd3ce2051d54eedaecc0 (diff)
downloadfork-ledger-14ab4f7775fe203e6e5cd2b9cb4d364c465c4e4e.tar.gz
fork-ledger-14ab4f7775fe203e6e5cd2b9cb4d364c465c4e4e.tar.bz2
fork-ledger-14ab4f7775fe203e6e5cd2b9cb4d364c465c4e4e.zip
Updated to Boost 1.50
Diffstat (limited to 'lib/build.sh')
-rwxr-xr-xlib/build.sh6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/build.sh b/lib/build.sh
index 28408d73..4fadccfa 100755
--- a/lib/build.sh
+++ b/lib/build.sh
@@ -7,11 +7,11 @@
export PATH=$PATH:/opt/local/lib/openmpi/bin
cat > ~/user-config.jam <<EOF
-using clang-darwin : : "/usr/local/bin/clang++" : <cxxflags>-std=c++11 <include>/usr/local/include ;
+using clang-darwin : : "/usr/local/bin/clang++" : <cxxflags>-std=c++11 ;
EOF
# jww (2012-04-24): This is still linking against /usr/lib/libc++.1.dylib
# instead of /usr/local/lib/libc++.1.dylib
-make CXX=clang++ LD=clang++ CC=clang OPTJ=-j20 \
+make CXX=clang++ LD=clang++ CC=clang OPTJ=-j20 \
BOOST_TOOLSET=clang-darwin DIR_SUFFIX=clang31 \
- BOOST_DEFINES="-sICU_PATH=/usr/local cxxflags=\"-g -std=c++11 -nostdlibinc -I/usr/local/include -I/usr/local/include/c++/v1 -I/opt/local/include -I/usr/include -stdlib=libc++\" linkflags=\"-g -Z -L/usr/local/lib -L/opt/local/lib -L/usr/lib /usr/local/lib/libc++.dylib -stdlib=libc++\""
+ BOOST_DEFINES="-sHAVE_ICONV=1 -sICONV_PATH=/usr/local -sHAVE_ICU=1 -sICU_PATH=/usr/local cxxflags=\"-g -std=c++11 $* -nostdlibinc -isystem /usr/local/include -isystem /opt/local/include -isystem /usr/local/include/c++/v1 -isystem /usr/include -stdlib=libc++\" linkflags=\"-g $* -L/usr/local/lib -L/opt/local/lib -L/usr/lib /usr/local/lib/libc++.dylib -stdlib=libc++\""