diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d942fd3..8f3f2f7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -88,6 +88,10 @@ include:
   - project: 'libretro-infrastructure/ci-templates'
     file: '/emscripten-static.yml'
 
+  # webOS 32-bit (LGTV)
+  - project: 'libretro-infrastructure/ci-templates'
+    file: '/webos-make.yml'
+
 # Stages for building
 stages:
   - build-prepare
@@ -227,3 +231,9 @@ libretro-build-emscripten:
   extends:
     - .libretro-emscripten-static-retroarch-master
     - .core-defs
+
+# webOS 32-bit
+libretro-build-webos-armv7a:
+  extends:
+    - .libretro-webos-armv7a-make-default
+    - .core-defs
diff --git a/Makefile b/Makefile
index aeb1215..a8b8f0f 100644
--- a/Makefile
+++ b/Makefile
@@ -49,8 +49,8 @@ unixpath = $(subst \,/,$1)
 unixcygpath = /$(subst :,,$(call unixpath,$1))
 
 ifneq (,$(findstring unix,$(platform)))
-    AR = ${CC_PREFIX}ar
-    CC = ${CC_PREFIX}gcc
+    AR ?= ${CC_PREFIX}ar
+    CC ?= ${CC_PREFIX}gcc
 
     TARGET := $(TARGET_NAME)_libretro.so
     fpic := -fPIC