summaryrefslogtreecommitdiffstats
path: root/util
diff options
context:
space:
mode:
authorBen Laurie <ben@links.org>2013-03-02 04:44:36 +0000
committerBen Laurie <ben@links.org>2013-03-04 14:31:18 +0000
commitd0aeeee176dabbecd993313f357e83b8286a6a56 (patch)
tree39086ffde9f6ecf06adecaa090daae0cd50e8b9e /util
parentafc1b1eab70eeee3ed29580d2b0ea184fc472612 (diff)
Use "copy" instead of "auto".
Diffstat (limited to 'util')
-rwxr-xr-xutil/mk1mf.pl11
1 files changed, 7 insertions, 4 deletions
diff --git a/util/mk1mf.pl b/util/mk1mf.pl
index 5984498c30..bb528f0c4b 100755
--- a/util/mk1mf.pl
+++ b/util/mk1mf.pl
@@ -107,7 +107,8 @@ $infile="MINFO";
"netware-libc", "CodeWarrior for NetWare - LibC - with WinSock Sockets",
"netware-libc-bsdsock", "CodeWarrior for NetWare - LibC - with BSD Sockets",
"default","cc under unix",
- "auto", "auto detect from top level Makefile"
+ "auto", "auto detect from top level Makefile",
+ "copy", "copy from top level Makefile"
);
$platform="";
@@ -196,7 +197,7 @@ $NT=0;
push(@INC,"util/pl","pl");
-if ($platform eq "auto") {
+if ($platform eq "auto" || $platform eq 'copy') {
$orig_platform = $platform;
$platform = $mf_platform;
print STDERR "Imported platform $mf_platform\n";
@@ -323,8 +324,10 @@ else
##else
{ $cflags="$c_flags$cflags" if ($c_flags ne ""); }
-$cflags = $mf_cflag if $orig_platform eq 'auto';
-$cc = $mf_cc if $orig_platform eq 'auto';
+if ($orig_platform eq 'copy') {
+ $cflags = $mf_cflag;
+ $cc = $mf_cc;
+}
$ex_libs="$l_flags$ex_libs" if ($l_flags ne "");