artemist/mes
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

build: Resurrect compiling with TinyCC.

Browse source 
./configure CC=tcc --host=i686-unknown-linux-gnu --with-courage

* configure: Cater for tcc.
This commit is contained in:
Jan Nieuwenhuizen 2019-12-12 06:55:43 +01:00
parent e354d8b165
commit 720f224a08
No known key found for this signature in database
GPG key ID: F3C1A0D9C1D65273
1 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
configure vendored
View file

@ -273,7 +273,7 @@ MES_ARENA=100000000 exec ${SCHEME-guile} -L . --no-auto-compile -e '(configure)'
(define (check-compile-string-c cc string) (define (check-compile-string-c cc string)
(with-output-to-file ".config.c" (with-output-to-file ".config.c"
(cut display string)) (cut display string))
(let ((test (lambda _ (apply system* `(,cc "--std=gnu99" "-c" "-o" ".config.o" ,@(cflags-list) ".config.c"))))) (let ((test (lambda _ (apply system* `(,cc "-std=gnu99" "-c" "-o" ".config.o" ,@(cflags-list) ".config.c")))))
(zero? (if %verbose? (test) (zero? (if %verbose? (test)
(with-error-to-file "/dev/null" (with-error-to-file "/dev/null"
test))))) test)))))
@ -281,7 +281,7 @@ MES_ARENA=100000000 exec ${SCHEME-guile} -L . --no-auto-compile -e '(configure)'
(define (check-link-string-c cc string) (define (check-link-string-c cc string)
(with-output-to-file ".config.c" (with-output-to-file ".config.c"
(cut display string)) (cut display string))
(let ((test (lambda _ (apply system* `(,cc "--std=gnu99" "-o" ".config" ,@(cflags-list) ,@(ldflags-list) ".config.c"))))) (let ((test (lambda _ (apply system* `(,cc "-std=gnu99" "-o" ".config" ,@(cflags-list) ,@(ldflags-list) ".config.c")))))
(zero? (if %verbose? (test) (zero? (if %verbose? (test)
(with-error-to-file "/dev/null" (with-error-to-file "/dev/null"
test))))) test)))))
@ -436,9 +436,7 @@ Some influential environment variables:
(when %verbose? (when %verbose?
(stderr "configure args=~s\n" args)) (stderr "configure args=~s\n" args))
(for-each (lambda (v) (apply setenv (string-split v #\=))) vars) (for-each (lambda (v) (apply setenv (string-split v #\=))) vars)
(let* ((tinycc-prefix (or (getenv "TINYCC_PREFIX") (let* ((cross? (not (equal? host-type build-type)))
(string-append srcdest "../tinycc-prefix")))
(cross? (not (equal? host-type build-type)))
(gcc (or (getenv "CC") (if cross? (string-append host-type "-" "gcc") "gcc"))) (gcc (or (getenv "CC") (if cross? (string-append host-type "-" "gcc") "gcc")))
(tcc (or (getenv "TCC") "tcc")) (tcc (or (getenv "TCC") "tcc"))
(mescc (or (getenv "MESCC") "mescc")) (mescc (or (getenv "MESCC") "mescc"))
@ -457,6 +455,8 @@ Some influential environment variables:
(make-dep "bash" #:version '(2 0) #:optional? #t) (make-dep "bash" #:version '(2 0) #:optional? #t)
(make-dep "guild" #:version '(2 0) #:commands '("guild" "guile-tools" "true")) (make-dep "guild" #:version '(2 0) #:commands '("guild" "guile-tools" "true"))
(make-dep "cc" #:commands (list gcc "cc" tcc mescc) #:optional? #t) (make-dep "cc" #:commands (list gcc "cc" tcc mescc) #:optional? #t)
(make-dep "tcc" #:commands (list tcc "tcc") #:optional? #t #:version-option "-v")
(make-dep "mescc" #:commands (list mescc "mescc") #:optional? #t)
(make-dep "make" #:optional? #t #:commands '("gmake" "make")) (make-dep "make" #:optional? #t #:commands '("gmake" "make"))
(make-dep "makeinfo" #:optional? #t) (make-dep "makeinfo" #:optional? #t)
(make-dep "dot" #:version-option "-V" #:optional? #t) (make-dep "dot" #:version-option "-V" #:optional? #t)
@ -467,15 +467,14 @@ Some influential environment variables:
deps) deps)
deps)) deps))
(guile (or guile "guile")) (guile (or guile "guile"))
(cc (file-name "cc" deps)) (cc (or (file-name "cc" deps)
(file-name "tcc" deps)
(file-name "mescc" deps)))
(deps (if cc (deps (if cc
(cons* (check-header-c cc (make-dep "limits.h")) (cons* (check-header-c cc (make-dep "limits.h"))
(check-header-c cc (make-dep "stdio.h" #:optional? #t)) (check-header-c cc (make-dep "stdio.h" #:optional? #t))
deps) deps)
deps)) deps))
(deps (cons (check-file (make-dep "tinycc-prefix" #:optional? #t
#:file-name tinycc-prefix))
deps))
(missing (filter (conjoin (negate dependency-file-name) (missing (filter (conjoin (negate dependency-file-name)
(negate dependency-optional?)) deps)) (negate dependency-optional?)) deps))
(deps (if cc (deps (if cc
@ -493,9 +492,9 @@ Some influential environment variables:
")) "))
deps) deps)
deps)) deps))
(mesc? (file-name "cc is Mes C" deps)) (mesc? (file-name "cc is MES C" deps))
(deps (if cc (deps (if cc
(cons (check-compile-c cc (make-dep "cc is Tiny CC" #:data "#if !defined (__TINYCC__) (cons (check-compile-c cc (make-dep "cc is Tiny CC" #:data "#if !defined (__TINYC__)
#error no tinycc #error no tinycc
#endif #endif
")) "))
@ -507,7 +506,8 @@ Some influential environment variables:
deps) deps)
deps)) deps))
(system-libc? (and with-system-libc? (file-name "if cc can create executables" deps))) (system-libc? (and with-system-libc? (file-name "if cc can create executables" deps)))
(host-type (or (and cc (gulp-pipe* cc "-dumpmachine")) host-type)) (host-type (or (and cc (let ((dump (gulp-pipe* cc "-dumpmachine")))
(and (not (string-null? dump)) dump))) host-type))
(host-type-list (string-split host-type #\-)) (host-type-list (string-split host-type #\-))
(mes-cpu (car host-type-list)) (mes-cpu (car host-type-list))
(mes-cpu (cond ((member mes-cpu '("i386" "i486" "i586" "i686")) "x86") (mes-cpu (cond ((member mes-cpu '("i386" "i486" "i586" "i686")) "x86")
@ -521,7 +521,7 @@ Some influential environment variables:
(cut member <> '("pc" "portbld" "unknown"))) (cut member <> '("pc" "portbld" "unknown")))
(cdr host-type-list)))) (cdr host-type-list))))
(mes-kernel (if (string-prefix? "freebsd" mes-kernel) "freebsd" mes-kernel)) (mes-kernel (if (string-prefix? "freebsd" mes-kernel) "freebsd" mes-kernel))
(compiler (if gcc? "gcc" "mescc")) (compiler (cond (gcc? "gcc") (tcc? "gcc") (else "mescc")))
(mes-system (string-join (list mes-cpu mes-kernel "mes") "-")) (mes-system (string-join (list mes-cpu mes-kernel "mes") "-"))
(bash (or (and (file-exists? "/bin/bash") "/bin/bash") (bash (or (and (file-exists? "/bin/bash") "/bin/bash")
(file-name "bash" deps) (file-name "bash" deps)
@ -606,7 +606,7 @@ See \"Porting GNU Mes\" in the manual, or try --with-courage\n" mes-system)
("@AR@" . ,(or (file-name "ar" deps) "")) ("@AR@" . ,(or (file-name "ar" deps) ""))
("@BASH@" . ,bash) ("@BASH@" . ,bash)
("@CC@" . ,(or (file-name "cc" deps) "")) ("@CC@" . ,(or (file-name "cc" deps) (file-name "tcc" deps) ""))
("@DIFF@" . ,(or (file-name "diff" deps) (string-append abs-top-builddir "/pre-inst-env diff.scm"))) ("@DIFF@" . ,(or (file-name "diff" deps) (string-append abs-top-builddir "/pre-inst-env diff.scm")))
("@DOT@" . ,(or (file-name "dot" deps) "")) ("@DOT@" . ,(or (file-name "dot" deps) ""))
("@GIT@" . ,(or (file-name "git" deps) "")) ("@GIT@" . ,(or (file-name "git" deps) ""))