app-emulation/wine-vanilla: respect CROSS*FLAGS again

Oops, overlooked while changing this around. Now with more syntax highlighting confusion for vim. Signed-off-by: Ionen Wolkens <[email protected]>
johu · Aug 10, 2023 · 5545565 · 5545565
1 parent 15bf593
commit 5545565
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/app-emulation/wine-vanilla/wine-vanilla-8.13.ebuild b/app-emulation/wine-vanilla/wine-vanilla-8.13.ebuild
@@ -271,7 +271,7 @@ src_configure() {
 			ac_cv_prog_x86_64_CC="${mingwcc_amd64}"
 			ac_cv_prog_i386_CC="${mingwcc_x86}"
 
-			CROSSCFLAGS="$(
+			CROSSCFLAGS="${CROSSCFLAGS:-$(
 				filter-flags '-fstack-protector*' #870136
 				filter-flags '-mfunction-return=thunk*' #878849
 
@@ -282,13 +282,13 @@ src_configure() {
 				use custom-cflags || append-cflags -mno-avx
 
 				CC=${mingwcc} test-flags-CC ${CFLAGS:--O2}
-			)"
+			)}"
 
-			CROSSLDFLAGS="$(
+			CROSSLDFLAGS="${CROSSLDFLAGS:-$(
 				filter-flags '-fuse-ld=*'
 
 				CC=${mingwcc} test-flags-CCLD ${LDFLAGS}
-			)"
+			)}"
 		)
 	fi
 

diff --git a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
@@ -271,7 +271,7 @@ src_configure() {
 			ac_cv_prog_x86_64_CC="${mingwcc_amd64}"
 			ac_cv_prog_i386_CC="${mingwcc_x86}"
 
-			CROSSCFLAGS="$(
+			CROSSCFLAGS="${CROSSCFLAGS:-$(
 				filter-flags '-fstack-protector*' #870136
 				filter-flags '-mfunction-return=thunk*' #878849
 
@@ -282,13 +282,13 @@ src_configure() {
 				use custom-cflags || append-cflags -mno-avx
 
 				CC=${mingwcc} test-flags-CC ${CFLAGS:--O2}
-			)"
+			)}"
 
-			CROSSLDFLAGS="$(
+			CROSSLDFLAGS="${CROSSLDFLAGS:-$(
 				filter-flags '-fuse-ld=*'
 
 				CC=${mingwcc} test-flags-CCLD ${LDFLAGS}
-			)"
+			)}"
 		)
 	fi