[vlc-commits] macOS build.sh: Move debug flags into env.build.sh

[David Fuhrmann]

vlc | branch: master | David Fuhrmann <dfuhrmann at videolan.org> | Sat Mar 10 10:31:25 2018 +0100| [77cd66126f73b0d697b78cd380d034a442aacd66] | committer: David Fuhrmann

macOS build.sh: Move debug flags into env.build.sh

Those are also usually wanted by developement builds.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=77cd66126f73b0d697b78cd380d034a442aacd66
---

 extras/package/macosx/build.sh     | 5 -----
 extras/package/macosx/env.build.sh | 7 ++++++-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/extras/package/macosx/build.sh b/extras/package/macosx/build.sh
index 3d7264d5ff..d92f9fa933 100755
--- a/extras/package/macosx/build.sh
+++ b/extras/package/macosx/build.sh
@@ -173,11 +173,6 @@ spopd
 
 vlcUnsetContribEnvironment
 
-# Enable debug symbols by default
-export CFLAGS="-g"
-export CXXFLAGS="-g"
-export OBJCFLAGS="-g"
-
 #
 # vlc/bootstrap
 #
diff --git a/extras/package/macosx/env.build.sh b/extras/package/macosx/env.build.sh
index e04ac79b58..40f2f65aee 100755
--- a/extras/package/macosx/env.build.sh
+++ b/extras/package/macosx/env.build.sh
@@ -108,7 +108,7 @@ vlcSetContribEnvironment() {
 }
 
 vlcUnsetContribEnvironment() {
-    echo "Unsetting contrib environment"
+    echo "Unsetting contrib flags, prepare VLC flags"
 
     unset CFLAGS
     unset CXXFLAGS
@@ -117,6 +117,11 @@ vlcUnsetContribEnvironment() {
     unset EXTRA_CFLAGS
     unset EXTRA_LDFLAGS
     unset XCODE_FLAGS
+
+    # Enable debug symbols by default
+    export CFLAGS="-g"
+    export CXXFLAGS="-g"
+    export OBJCFLAGS="-g"
 }