2 files changed, 33 insertions, 18 deletions
diff --git a/x11/eaglemode/files/patch-makers-unicc-plugins-unicc__gnu.pm b/x11/eaglemode/files/patch-makers-unicc-plugins-unicc__gnu.pm
deleted file mode 100644
index 03823c0b2463..000000000000
--- a/x11/eaglemode/files/patch-makers-unicc-plugins-unicc__gnu.pm
+++ /dev/null
@@ -1,18 +0,0 @@
---- makers/unicc/plugins/unicc_gnu.pm.orig	2008-10-29 08:27:34.000000000 +0300
-+++ makers/unicc/plugins/unicc_gnu.pm	2008-10-30 00:08:33.000000000 +0300
-@@ -142,6 +142,7 @@
- 		push(@args,GetObjFiles->[$index]);
- 	}
- 
-+	@args = split(/\s+/, join(' ', @args));
- 	return PrintAndRun(@args);
- }
- 
-@@ -178,6 +179,7 @@
- 		}
- 	}
- 
-+	@args = split(/\s+/, join(' ', @args));
- 	return PrintAndRun(@args);
- }
- 
diff --git a/x11/eaglemode/files/patch-makers_unicc_plugins_unicc__gnu.pm b/x11/eaglemode/files/patch-makers_unicc_plugins_unicc__gnu.pm
new file mode 100644
index 000000000000..2889c9c9588e
--- /dev/null
+++ b/x11/eaglemode/files/patch-makers_unicc_plugins_unicc__gnu.pm
@@ -0,0 +1,33 @@
+--- makers/unicc/plugins/unicc_gnu.pm.orig	2018-12-23 06:47:44 UTC
++++ makers/unicc/plugins/unicc_gnu.pm
+@@ -35,7 +35,7 @@ my $IsWinOrCygwin;
+ my $IsDarwin;
+ 
+ {
+-	my $s=`gcc -dumpversion`; # Examples: "4.3", "2.95.3"
++	my $s=`$ENV{'CC'} -dumpversion`; # Examples: "4.3", "2.95.3"
+ 	if ($? != 0) { exit(1); }
+ 	for (;; $s=substr($s,1)) {
+ 		if (length($s)==0) { die("Cannot determine GCC version, stopped"); }
+@@ -112,9 +112,9 @@ sub Compile
+ 		push(@args,("-o",GetObjFiles->[$index]));
+ 	}
+ 	else {
+-		push(@args,"gcc");
++		push(@args,$isCpp ? $ENV{'CXX'} : $ENV{'CC'});
+ 		if (HaveDebug) { push(@args,"-g"); }
+-		push(@args,"-O2");
++		push(@args,split(/\s+/, $isCpp ? $ENV{'CXXFLAGS'} : $ENV{'CFLAGS'}));
+ 		if ($isCpp && $GccVersion>=4.7 && $GccVersion<6.1) {
+ 			push(@args,"-std=c++11");
+ 		}
+@@ -167,7 +167,8 @@ sub Link
+ 		push(@args,(@{GetObjFiles()}));
+ 	}
+ 	else {
+-		push(@args,"gcc");
++		push(@args,$ENV{'CC'});
++		push(@args,split(/\s+/, $ENV{'LDFLAGS'}));
+ 		if (HaveDebug) { push(@args,"-g"); }
+ 		if ($type eq 'dynlib') {
+ 			push(@args,$IsDarwin ? "-dynamiclib" : "-shared");