diff --git a/build.sh b/build.sh index ba9fffc..7b2357c 100755 --- a/build.sh +++ b/build.sh @@ -16,31 +16,6 @@ exit 1 fi -VERSION=$($DMD --version 2>/dev/null | sed -En 's|.*DMD.* v([[:digit:]\.]+).*|\1|p') -# workaround for link order issues with libcurl (phobos needs to come before curl) -if [[ $VERSION < 2.069.0 ]]; then - # link against libcurl - LIBS=`pkg-config --libs libcurl 2>/dev/null || echo "-lcurl"` - - # fix for modern GCC versions with --as-needed by default - if [[ `$DMD --help | head -n1 | grep 'DMD\(32\|64\)'` ]]; then - if [ `uname` = "Linux" ]; then - LIBS="-l:libphobos2.a $LIBS" - else - LIBS="-lphobos2 $LIBS" - fi - elif [[ `$DMD --help | head -n1 | grep '^LDC '` ]]; then - if [ `uname` = "SunOS" ]; then - LIBS="-lnsl -lsocket -lphobos2-ldc $LIBS" - else - LIBS="-lphobos2-ldc $LIBS" - fi - fi - - # adjust linker flags for dmd command line - LIBS=`echo "$LIBS" | sed 's/^-L/-L-L/; s/ -L/ -L-L/g; s/^-l/-L-l/; s/ -l/ -L-l/g'` -fi - if [ "$GITVER" = "" ]; then GITVER=$(git describe) || echo "Could not determine a version with git." fi @@ -56,7 +31,7 @@ MACOSX_DEPLOYMENT_TARGET=10.8 echo Running $DMD... -$DMD -ofbin/dub -g -O -w -version=DubUseCurl -version=DubApplication -Isource $* $LIBS @build-files.txt +$DMD -ofbin/dub -g -O -w -version=DubUseCurl -version=DubApplication -Isource $* @build-files.txt bin/dub --version echo DUB has been built as bin/dub. echo