diff options
| author | John Wiegley <johnw@newartisans.com> | 2012-04-25 03:08:03 -0500 |
|---|---|---|
| committer | John Wiegley <johnw@newartisans.com> | 2012-04-25 03:09:56 -0500 |
| commit | 72d10112512278b219220458a13dbc53f5b646f5 (patch) | |
| tree | 4898807e5f9f2415fe2f967fb7f38b820359fff3 /lib | |
| parent | 6af3f0448fe8b3bf3472504a3ee547a816ab381a (diff) | |
| download | fork-ledger-72d10112512278b219220458a13dbc53f5b646f5.tar.gz fork-ledger-72d10112512278b219220458a13dbc53f5b646f5.tar.bz2 fork-ledger-72d10112512278b219220458a13dbc53f5b646f5.zip | |
Build-related changes
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Makefile | 3 | ||||
| -rwxr-xr-x | lib/build.sh | 12 |
2 files changed, 7 insertions, 8 deletions
diff --git a/lib/Makefile b/lib/Makefile index ba7f5ffa..cb05e44d 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -49,12 +49,11 @@ all: boost-build #icu-build boost-icu-build prepare-boost: perl -i -pe 's/local command = \[ common\.get-invocation-command darwin : g\+\+ : .*/local command = [ common.get-invocation-command darwin : g++ : $(CXX) ] ;/;' $(BOOST_SOURCE)/tools/build/v2/tools/darwin.jam perl -i -pe 's/flags darwin\.compile OPTIONS : -no-cpp-precomp -gdwarf-2 (-fexceptions )?;/flags darwin\.compile OPTIONS : -gdwarf-2 \1;/;' $(BOOST_SOURCE)/tools/build/v2/tools/darwin.jam - perl -i -pe 's/command = \[ common\.get-invocation-command clang-darwin : clang\+\+ $$/command = [ common.get-invocation-command clang-darwin : clang++-mp-3.1/;' $(BOOST_SOURCE)/tools/build/v2/tools/clang-darwin.jam boost-build: prepare-boost (cd $(BOOST_SOURCE) && \ sh bootstrap.sh && \ - ./b2 $(OPTJ) debug --prefix=$(BOOST_STOW) \ + ./b2 $(OPTJ) debug release --prefix=$(BOOST_STOW) \ --build-dir=$(BOOST_BUILD) $(BOOST_FLAGS) install) icu-build: diff --git a/lib/build.sh b/lib/build.sh index 2d18dc58..28408d73 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 : : "/opt/local/bin/clang++-mp-3.1" : <cxxflags>-std=c++11 ; +using clang-darwin : : "/usr/local/bin/clang++" : <cxxflags>-std=c++11 <include>/usr/local/include ; EOF -make CXX=clang++-mp-3.1 LD=clang++-mp-3.1 CC=clang-mp-3.1 OPTJ=-j16 \ - CXXFLAGS="-g -std=c++11 -stdlib=libc++" \ - LDFLAGS="-g -stdlib=libc++" \ - BOOST_TOOLSET=clang DIR_SUFFIX=clang31 \ - BOOST_DEFINES="include=/opt/local/include -sICU_PATH=/opt/local -sICONV_PATH=/opt/local cxxflags=\"-g -std=c++11 -stdlib=libc++\" linkflags=\"-g -stdlib=libc++\""
\ No newline at end of file +# 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 \ + 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++\"" |