From 1f70f92d6a2cd147f99ce37af8ce5face13e8cd3 Mon Sep 17 00:00:00 2001
From: amrein <amrein@f0d560ea-af0d-0410-9eb7-867de7ffcac7>
Date: Wed, 25 Jan 2017 19:09:16 +0000
Subject: [PATCH] Remove linker optimisation directly in domake (for Mac OS X)

git-svn-id: svn://ultimatepp.org/upp/trunk@10758 f0d560ea-af0d-0410-9eb7-867de7ffcac7
---
 uppbox/Scripts/domake | 7 +++++++
 uppbox/Scripts/src    | 4 ----
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/uppbox/Scripts/domake b/uppbox/Scripts/domake
index 05660659c..7a7adc481 100755
--- a/uppbox/Scripts/domake
+++ b/uppbox/Scripts/domake
@@ -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
diff --git a/uppbox/Scripts/src b/uppbox/Scripts/src
index ae9ad9505..c085145d9 100644
--- a/uppbox/Scripts/src
+++ b/uppbox/Scripts/src
@@ -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