From 7acf9aa86275a24b468786d6ea9f308ae33f011c Mon Sep 17 00:00:00 2001
From: grischka <grischka>
Date: Tue, 25 Apr 2017 21:01:54 +0200
Subject: final adjustments for release

- configure/Makefiles: minor adjustments

- build-tcc.bat: add -static to gcc options
  (avoids libgcc_s*.dll dependency with some mingw versions)

- tccpe.c/tcctools.c: eliminate MAX_PATH
  (not available for cross compilers)

- tccasm.c: use uint64_t/strtoull in unary()
  (unsigned long sometimes is only uint32_t, as always on windows)

- tccgen.c: Revert (f077d16c) "tccgen: gen_cast: cast FLOAT to DOUBLE"
  Was a rather experimental, tentative commit, not really necessary
  and somewhat ugly too.

- cleanup recent osx support:
  - Makefile/libtcc.c: cleanup copy&paste code
  - tccpp.c: restore deleted function
---
 configure | 34 +++++++++++++++++++---------------
 1 file changed, 19 insertions(+), 15 deletions(-)
 mode change 100755 => 100644 configure

(limited to 'configure')

diff --git a/configure b/configure
old mode 100755
new mode 100644
index 2a019d8..4182f9a
--- a/configure
+++ b/configure
@@ -33,7 +33,7 @@ cross_prefix=""
 cc="gcc"
 ar="ar"
 strip="strip"
-cygwin="no"
+noldl="no"
 gprof="no"
 bigendian="no"
 mingw32="no"
@@ -53,28 +53,26 @@ cpu=
 # OS specific
 targetos=`uname`
 case $targetos in
-  Darwin)    osx=yes;;
-  MINGW*)    mingw32=yes;;
-  MSYS*)     mingw32=yes;;
-  CYGWIN*)   mingw32=yes; cygwin=yes; cross_prefix="mingw32-";;
-  DragonFly) noldl=yes;;
-  OpenBSD)   noldl=yes;;
-  FreeBSD)   noldl=yes;;
-  NetBSD)    noldl=yes;;
-  *) ;;
+  Darwin)
+    osx=yes
+    ;;
+  MINGW*|MSYS*|CYGWIN*)
+    mingw32=yes
+    ;;
+  DragonFly|OpenBSD|FreeBSD|NetBSD)
+    noldl=yes
+    ;;
+  *)
+    ;;
 esac
 
 # find source path
-# XXX: we assume an absolute path is given when launching configure, 
-# except in './configure' case.
 source_path=${0%configure}
 source_path=${source_path%/}
 source_path_used="yes"
 if test -z "$source_path" -o "$source_path" = "." ; then
     source_path=`pwd`
     source_path_used="no"
-    # mingw compilers might not understand cygwin paths
-    if test $cygwin = "yes"; then source_path="."; fi
 fi
 
 for opt do
@@ -130,7 +128,7 @@ for opt do
   ;;
   --enable-gprof) gprof="yes"
   ;;
-  --enable-mingw32) mingw32="yes" ; cross_prefix="i686-pc-mingw32-" ; cpu=x86
+  --enable-mingw32) mingw32="yes"
   ;;
   --enable-cross) build_cross="yes"
   ;;
@@ -211,6 +209,12 @@ if test -z "$CFLAGS"; then
 fi
 
 if test "$mingw32" = "yes" ; then
+    if test "$source_path_used" = "no"; then
+      source_path="."
+    fi
+    if test "$cc" = gcc; then
+      test -z "$LDFLAGS" && LDFLAGS="-static"
+    fi
     if test x"$tccdir" = x""; then
       tccdir="tcc"
     fi
-- 
cgit v1.3.1