github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-06-10 14:22:46 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

Remove linker optimisation directly in domake (for Mac OS X)

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@10758 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
amrein 2017-01-25 19:09:16 +00:00
parent 292338df68
commit 1f70f92d6a
2 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
uppbox/Scripts/domake
View file

@ -372,6 +372,13 @@ else
fi
if [ "$platform" = "Darwin" ]
then
log_debug_info "Adjusting Makefile/uMakefile for Mac OS X"
sed -i -E -e 's/(-Wl,[^[:space:]]*)//g' uppsrc/Makefile
sed -i -E -e 's/(-Wl,[^[:space:]]*)//g' uppsrc/uMakefile
fi
if [ ! -f /usr/lib/libdl.so -a ! -f /usr/lib64/libdl.so ]
then
sed -i -e s/-ldl//g uppsrc/Makefile

4
uppbox/Scripts/src
View file

@ -18,14 +18,10 @@ cp -p ~/Scripts/GCCMK.bm ~/.upp/theide
~/bin/umk ~/upp.src/uppsrc ide GCCMK -asrXk ~/upp.tmp/upp/uppsrc
mv ~/upp.tmp/upp/uppsrc/Makefile ~/upp.tmp/upp/uppsrc/Makefile.in
# remove linker optimisation option because we are building an executable: "-Wl,-O,2"
sed -i -e 's| -Wl,-O,2||g' ~/upp.tmp/upp/uppsrc/Makefile.in
~/bin/umk ~/upp.src/uppsrc umk GCCMK -asrXk ~/upp.tmp/upp/uppsrc
mv ~/upp.tmp/upp/uppsrc/Makefile ~/upp.tmp/upp/uppsrc/uMakefile.in
# remove linker optimisation option because we are building an executable: "-Wl,-O,2"
sed -i -e 's| -Wl,-O,2||g' ~/upp.tmp/upp/uppsrc/uMakefile.in
cp -p ~/Scripts/Makefile ~/upp.tmp/upp
cp -p ~/Scripts/domake ~/upp.tmp/upp