diff options
| author | Steve Bennett <steveb@workware.net.au> | 2022-08-20 16:18:21 +1000 |
|---|---|---|
| committer | Steve Bennett <steveb@workware.net.au> | 2022-08-20 16:20:31 +1000 |
| commit | c1e7d85ba7ee043e3c6ea2779fdeeb675a013c1d (patch) | |
| tree | 945eb3600da6e5e2bcbdbd33d9fa0817eaf6cf64 | |
| parent | 36430b868343ff9315ab342ee531b31bce6b3c73 (diff) | |
| download | jimtcl-c1e7d85ba7ee043e3c6ea2779fdeeb675a013c1d.zip jimtcl-c1e7d85ba7ee043e3c6ea2779fdeeb675a013c1d.tar.gz jimtcl-c1e7d85ba7ee043e3c6ea2779fdeeb675a013c1d.tar.bz2 | |
build: Fix a few places that AS_CFLAGS was missing
Signed-off-by: Steve Bennett <steveb@workware.net.au>
| -rw-r--r-- | auto.def | 4 | ||||
| -rw-r--r-- | autosetup/local.tcl | 2 |
2 files changed, 3 insertions, 3 deletions
@@ -606,10 +606,10 @@ foreach mod $extinfo(module-c) { set obj [file rootname $src].o lappend objs $obj lappend lines "\t\$(ECHO)\t\"\tCC\t$obj\"" - lappend lines "\t\$(Q)\$(CC) \$(CFLAGS) \$(SHOBJ_CFLAGS) -c -o $obj \$(srcdir)/$src" + lappend lines "\t\$(Q)\$(CC) \$(AS_CFLAGS) \$(AS_CPPFLAGS) \$(CFLAGS) \$(CPPFLAGS) \$(SHOBJ_CFLAGS) -c -o $obj \$(srcdir)/$src" } lappend lines "\t\$(ECHO)\t\"\tLDSO\t\$@\"" - lappend lines "\t\$(Q)\$(CC) \$(CFLAGS) \$(LDFLAGS) \$(SHOBJ_LDFLAGS) -o \$@ $objs \$(SH_LIBJIM) $libs" + lappend lines "\t\$(Q)\$(CC) \$(AS_CFLAGS) \$(CFLAGS) \$(LDFLAGS) \$(SHOBJ_LDFLAGS) -o \$@ $objs \$(SH_LIBJIM) $libs" lappend lines "" } define BUILD_SHOBJS [join $lines \n] diff --git a/autosetup/local.tcl b/autosetup/local.tcl index 8d5da9b..78ef27c 100644 --- a/autosetup/local.tcl +++ b/autosetup/local.tcl @@ -185,7 +185,7 @@ proc add-pkgconfig-deps {ext pkgs asmodule} { define-append LDLIBS [pkg-config-get $pkg LIBS] } define-append LDFLAGS [pkg-config-get $pkg LDFLAGS] - define-append CCOPTS [pkg-config-get $pkg CFLAGS] + define-append AS_CFLAGS [pkg-config-get $pkg CFLAGS] define-append PKG_CONFIG_REQUIRES $pkg } } |