ci: static link AppVeyor binaries

JaCzekanski · May 24, 2020 · f3bff62 · f3bff62
1 parent 7c49d43
commit f3bff62
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 5 deletions.
diff --git a/.travis/android/run-container.sh b/.travis/android/run-container.sh
@@ -9,6 +9,7 @@ fi
 mkdir -p "$HOME/.ccache"
 
 docker run \
+    -e CI=$CI \
     -v $(pwd):/home/build \
     -v "$HOME/.ccache":/root/.ccache \
     -e keystore_password="$keystore_password" \

diff --git a/.travis/linux/build.sh b/.travis/linux/build.sh
@@ -24,7 +24,7 @@ ccache -s
 # Tests
 ./build/release_x64/avocado_test --use-colour yes
 
-wget -nv https://gist.github.com/JaCzekanski/d7a6e06295729a3f81bd9bd488e9d37d/raw/d5bc41278fd198ef5e4afceb35e0587aca7f2f60/gte_valid_0xc0ffee_50.log
+wget -ncv https://gist.github.com/JaCzekanski/d7a6e06295729a3f81bd9bd488e9d37d/raw/d5bc41278fd198ef5e4afceb35e0587aca7f2f60/gte_valid_0xc0ffee_50.log
 ./build/release_x64/avocado_autotest gte_valid_0xc0ffee_50.log
 
 # Package
@@ -36,7 +36,7 @@ cp android/app/src/main/ic_launcher-web.png $ARTIFACT/avocado.png
 # Remove .gitignore
 find $ARTIFACT -type f -name .gitignore -exec rm {} \;
 
-wget https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-x86_64.AppImage
+wget -ncv https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-x86_64.AppImage
 chmod +x ./linuxdeploy-x86_64.AppImage
 
 APPIMAGE_EXTRACT_AND_RUN=1 ./linuxdeploy-x86_64.AppImage \

diff --git a/.travis/linux/run-container.sh b/.travis/linux/run-container.sh
@@ -6,6 +6,7 @@ CLANG_VERSION=${1:-6}
 mkdir -p "$HOME/.ccache"
 
 docker run \
+    -e CI=$CI \
     -v $(pwd):/home/build \
     -v "$HOME/.ccache":/root/.ccache \
     avocadoemu/linux-clang$CLANG_VERSION \

diff --git a/premake5.lua b/premake5.lua
@@ -61,6 +61,7 @@ filter {}
 	language "c++"
 	cppdialect "C++17"
 	defines { 'BUILD_ARCH="%{cfg.system}"' }
+	flags { "MultiProcessorCompile" }
 	exceptionhandling "On"
 	rtti "On"
 
@@ -129,14 +130,19 @@ filter "configurations:Debug"
 filter "configurations:Release"
 	staticruntime "on"
 	defines { "NDEBUG" }
-	flags { "MultiProcessorCompile" }
 	optimize "Full"
 
-filter {"configurations:Release"}
-	if os.getenv("CI") == true then
+-- LTO on Linux fails with "error adding symbols: Archive has no index; run ranlib to add one"
+filter {"configurations:Release", "not system:linux"}
+	if os.getenv("CI") ~= nil then
 		flags { "LinkTimeOptimization" }
 	end
 
+filter {"configurations:Release", "system:linux"}
+	if os.getenv("CI") ~= nil then
+		linkoptions { "-static-libstdc++" }
+	end
+
 include "premake/chdr.lua"
 include "premake/flac.lua"
 include "premake/glad.lua"