Skip to content

Commit c5576d9

Browse files
pbroadberypbroadbery
authored
Merge pull request #163 from aldorlang/fix-gcc-14
Fix gcc 14
2 parents ab66f65 + 5a875c8 commit c5576d9

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+88
-21
lines changed

‎aldor/Makefile.in

+1
Original file line numberDiff line numberDiff line change
@@ -354,6 +354,7 @@ LIBOBJS = @LIBOBJS@
354354
LIBS = @LIBS@
355355
LIBTOOL = @LIBTOOL@
356356
LIBTOOL_DEPS = @LIBTOOL_DEPS@
357+
LIB_CC_FLAGS = @LIB_CC_FLAGS@
357358
LIPO = @LIPO@
358359
LN_S = @LN_S@
359360
LTLIBOBJS = @LTLIBOBJS@

‎aldor/aldor/Makefile.in

+1
Original file line numberDiff line numberDiff line change
@@ -236,6 +236,7 @@ LIBOBJS = @LIBOBJS@
236236
LIBS = @LIBS@
237237
LIBTOOL = @LIBTOOL@
238238
LIBTOOL_DEPS = @LIBTOOL_DEPS@
239+
LIB_CC_FLAGS = @LIB_CC_FLAGS@
239240
LIPO = @LIPO@
240241
LN_S = @LN_S@
241242
LTLIBOBJS = @LTLIBOBJS@

‎aldor/aldor/lib/Makefile.in

+1
Original file line numberDiff line numberDiff line change
@@ -237,6 +237,7 @@ LIBOBJS = @LIBOBJS@
237237
LIBS = @LIBS@
238238
LIBTOOL = @LIBTOOL@
239239
LIBTOOL_DEPS = @LIBTOOL_DEPS@
240+
LIB_CC_FLAGS = @LIB_CC_FLAGS@
240241
LIPO = @LIPO@
241242
LN_S = @LN_S@
242243
LTLIBOBJS = @LTLIBOBJS@

‎aldor/aldor/lib/java/Makefile.in

+1
Original file line numberDiff line numberDiff line change
@@ -266,6 +266,7 @@ LIBOBJS = @LIBOBJS@
266266
LIBS = @LIBS@
267267
LIBTOOL = @LIBTOOL@
268268
LIBTOOL_DEPS = @LIBTOOL_DEPS@
269+
LIB_CC_FLAGS = @LIB_CC_FLAGS@
269270
LIPO = @LIPO@
270271
LN_S = @LN_S@
271272
LTLIBOBJS = @LTLIBOBJS@

‎aldor/aldor/lib/libfoam/Makefile.am

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ runtime_CSOURCES = \
2424
util.c \
2525
xfloat.c
2626

27-
AM_CFLAGS = -I$(aldorsrcdir) -I ../../src -DFOAM_RTS
27+
AM_CFLAGS = -I$(aldorsrcdir) -I ../../src -DFOAM_RTS $(LIB_CC_FLAGS)
2828

2929
lib_LIBRARIES =
3030

‎aldor/aldor/lib/libfoam/Makefile.in

+2-1
Original file line numberDiff line numberDiff line change
@@ -330,6 +330,7 @@ LIBOBJS = @LIBOBJS@
330330
LIBS = @LIBS@
331331
LIBTOOL = @LIBTOOL@
332332
LIBTOOL_DEPS = @LIBTOOL_DEPS@
333+
LIB_CC_FLAGS = @LIB_CC_FLAGS@
333334
LIPO = @LIPO@
334335
LN_S = @LN_S@
335336
LTLIBOBJS = @LTLIBOBJS@
@@ -442,7 +443,7 @@ runtime_CSOURCES = \
442443
util.c \
443444
xfloat.c
444445

445-
AM_CFLAGS = -I$(aldorsrcdir) -I ../../src -DFOAM_RTS
446+
AM_CFLAGS = -I$(aldorsrcdir) -I ../../src -DFOAM_RTS $(LIB_CC_FLAGS)
446447

447448
#############################################################################
448449
# :: Built-in bigint

‎aldor/aldor/lib/libfoamlib/Makefile.am

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ aldorsrcdir = $(abs_top_srcdir)/aldor/src
1212

1313
libfoamlib_a_SOURCES=$(libfoamlib_ALDOR)
1414
#CFLAGS=-Wno-error
15-
AM_CFLAGS=-I$(aldorsrcdir)
15+
AM_CFLAGS=-I$(aldorsrcdir) $(LIB_CC_FLAGS)
1616

1717
noinst_LIBRARIES=libfoamlib.a
1818

‎aldor/aldor/lib/libfoamlib/Makefile.in

+2-1
Original file line numberDiff line numberDiff line change
@@ -296,6 +296,7 @@ LIBOBJS = @LIBOBJS@
296296
LIBS = @LIBS@
297297
LIBTOOL = @LIBTOOL@
298298
LIBTOOL_DEPS = @LIBTOOL_DEPS@
299+
LIB_CC_FLAGS = @LIB_CC_FLAGS@
299300
LIPO = @LIPO@
300301
LN_S = @LN_S@
301302
LTLIBOBJS = @LTLIBOBJS@
@@ -398,7 +399,7 @@ other_files = al/libfoamlib.al
398399
aldorsrcdir = $(abs_top_srcdir)/aldor/src
399400
libfoamlib_a_SOURCES = $(libfoamlib_ALDOR)
400401
#CFLAGS=-Wno-error
401-
AM_CFLAGS = -I$(aldorsrcdir)
402+
AM_CFLAGS = -I$(aldorsrcdir) $(LIB_CC_FLAGS)
402403
noinst_LIBRARIES = libfoamlib.a
403404
all: all-recursive
404405

‎aldor/aldor/src/Makefile.in

+1
Original file line numberDiff line numberDiff line change
@@ -769,6 +769,7 @@ LIBOBJS = @LIBOBJS@
769769
LIBS = @LIBS@
770770
LIBTOOL = @LIBTOOL@
771771
LIBTOOL_DEPS = @LIBTOOL_DEPS@
772+
LIB_CC_FLAGS = @LIB_CC_FLAGS@
772773
LIPO = @LIPO@
773774
LN_S = @LN_S@
774775
LTLIBOBJS = @LTLIBOBJS@

‎aldor/aldor/subcmd/Makefile.in

+1
Original file line numberDiff line numberDiff line change
@@ -236,6 +236,7 @@ LIBOBJS = @LIBOBJS@
236236
LIBS = @LIBS@
237237
LIBTOOL = @LIBTOOL@
238238
LIBTOOL_DEPS = @LIBTOOL_DEPS@
239+
LIB_CC_FLAGS = @LIB_CC_FLAGS@
239240
LIPO = @LIPO@
240241
LN_S = @LN_S@
241242
LTLIBOBJS = @LTLIBOBJS@

‎aldor/aldor/subcmd/testaldor/Makefile.in

+1
Original file line numberDiff line numberDiff line change
@@ -227,6 +227,7 @@ LIBOBJS = @LIBOBJS@
227227
LIBS = @LIBS@
228228
LIBTOOL = @LIBTOOL@
229229
LIBTOOL_DEPS = @LIBTOOL_DEPS@
230+
LIB_CC_FLAGS = @LIB_CC_FLAGS@
230231
LIPO = @LIPO@
231232
LN_S = @LN_S@
232233
LTLIBOBJS = @LTLIBOBJS@

‎aldor/aldor/subcmd/unitools/Makefile.in

+1
Original file line numberDiff line numberDiff line change
@@ -274,6 +274,7 @@ LIBOBJS = @LIBOBJS@
274274
LIBS = @LIBS@
275275
LIBTOOL = @LIBTOOL@
276276
LIBTOOL_DEPS = @LIBTOOL_DEPS@
277+
LIB_CC_FLAGS = @LIB_CC_FLAGS@
277278
LIPO = @LIPO@
278279
LN_S = @LN_S@
279280
LTLIBOBJS = @LTLIBOBJS@

‎aldor/aldor/tools/Makefile.in

+1
Original file line numberDiff line numberDiff line change
@@ -236,6 +236,7 @@ LIBOBJS = @LIBOBJS@
236236
LIBS = @LIBS@
237237
LIBTOOL = @LIBTOOL@
238238
LIBTOOL_DEPS = @LIBTOOL_DEPS@
239+
LIB_CC_FLAGS = @LIB_CC_FLAGS@
239240
LIPO = @LIPO@
240241
LN_S = @LN_S@
241242
LTLIBOBJS = @LTLIBOBJS@

‎aldor/aldor/tools/unix/Makefile.in

+1
Original file line numberDiff line numberDiff line change
@@ -297,6 +297,7 @@ LIBOBJS = @LIBOBJS@
297297
LIBS = @LIBS@
298298
LIBTOOL = @LIBTOOL@
299299
LIBTOOL_DEPS = @LIBTOOL_DEPS@
300+
LIB_CC_FLAGS = @LIB_CC_FLAGS@
300301
LIPO = @LIPO@
301302
LN_S = @LN_S@
302303
LTLIBOBJS = @LTLIBOBJS@

‎aldor/configure

+21-5
Original file line numberDiff line numberDiff line change
@@ -709,6 +709,7 @@ HAVE_BOEHM_GC_TRUE
709709
HAVE_ALDOR_GC_FALSE
710710
HAVE_ALDOR_GC_TRUE
711711
GC
712+
LIB_CC_FLAGS
712713
BUILD_JAVA_FALSE
713714
BUILD_JAVA_TRUE
714715
JAVAC
@@ -5291,6 +5292,23 @@ fi
52915292
fi
52925293
fi
52935294

5295+
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking Options for build library .." >&5
5296+
printf %s "checking Options for build library ..... " >&6; }
5297+
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking $CC supports -Wno-int-conversion" >&5
5298+
printf %s "checking $CC supports -Wno-int-conversion... " >&6; }; echo "int main() { return 1; }" > conftest-Wno-int-conversion.c;
5299+
res=no
5300+
if $CC -Werror -Wno-int-conversion -c conftest-Wno-int-conversion.c > /dev/null 2>&1; then cfg_no_int_conversion="-Wno-int-conversion"; res=yes; fi;
5301+
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $res" >&5
5302+
printf "%s\n" "$res" >&6; }
5303+
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking $CC supports -Wno-incompatible-pointer-types" >&5
5304+
printf %s "checking $CC supports -Wno-incompatible-pointer-types... " >&6; }; echo "int main() { return 1; }" > conftest-Wno-incompatible-pointer-types.c;
5305+
res=no
5306+
if $CC -Werror -Wno-incompatible-pointer-types -c conftest-Wno-incompatible-pointer-types.c > /dev/null 2>&1; then cfg_no_incompatible_pointer_types="-Wno-incompatible-pointer-types"; res=yes; fi;
5307+
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $res" >&5
5308+
printf "%s\n" "$res" >&6; }
5309+
LIB_CC_FLAGS="${cfg_no_int_conversion} ${cfg_no_incompatible_pointer_types}"
5310+
5311+
52945312
# Check whether --enable-edit-gloop was given.
52955313
if test ${enable_edit_gloop+y}
52965314
then :
@@ -13438,7 +13456,9 @@ CC=$lt_save_CC
1343813456

1343913457

1344013458
# Enable extra warnings and -Werror if supported.
13441-
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking $CC supports -Wno-error=shift-negative-value" >&5
13459+
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking Strict options for C compiler" >&5
13460+
printf %s "checking Strict options for C compiler... " >&6; }
13461+
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking $CC supports -Wno-error=shift-negative-value" >&5
1344213462
printf %s "checking $CC supports -Wno-error=shift-negative-value... " >&6; }; echo "int main() { return -1 << 1; }" > conftest-Wno-error=shift-negative-value.c;
1344313463
res=no
1344413464
if $CC -Werror -Wno-error=shift-negative-value -c conftest-Wno-error=shift-negative-value.c > /dev/null 2>&1; then cfg_no_shift_negative_value="-Wno-error=shift-negative-value"; res=yes; fi;
@@ -13450,8 +13470,6 @@ printf %s "checking $CC supports -Wno-sign-compare... " >&6; }; echo "" > confte
1345013470
if $CC -Werror -Wno-sign-compare -c conftest-Wno-sign-compare.c > /dev/null 2>&1; then cfg_no_sign_compare="-Wno-sign-compare"; res=yes; fi;
1345113471
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $res" >&5
1345213472
printf "%s\n" "$res" >&6; }
13453-
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking Strict options for C compiler" >&5
13454-
printf %s "checking Strict options for C compiler... " >&6; }
1345513473

1345613474
cfgSTRICTCFLAGS="-pedantic -std=c99 -Wall -Wextra -Werror -Wno-empty-body -Wno-enum-compare \
1345713475
-Wno-missing-field-initializers -Wno-unused -Wno-unused-parameter \
@@ -13829,8 +13847,6 @@ fi
1382913847

1383013848

1383113849
# Git SHA1 hash as ld build-id.
13832-
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: gitid $gitid ld: $ld_has_build_id " >&5
13833-
printf "%s\n" "$as_me: gitid $gitid ld: $ld_has_build_id " >&6;}
1383413850
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking build id" >&5
1383513851
printf %s "checking build id... " >&6; }
1383613852
if test yes = "$ld_has_build_id" && test true = "$gitid"; then

‎aldor/configure.ac

+1
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ AC_ARG_ENABLE([documentation],
6969
[enable_documentation=no])
7070

7171
AX_LIB_READLINE
72+
ALDOR_LIB_COMPILE
7273
ALDOR_READLINE_OPTION
7374
ALDOR_READLINE_SELECT
7475

‎aldor/lib/Makefile.in

+1
Original file line numberDiff line numberDiff line change
@@ -236,6 +236,7 @@ LIBOBJS = @LIBOBJS@
236236
LIBS = @LIBS@
237237
LIBTOOL = @LIBTOOL@
238238
LIBTOOL_DEPS = @LIBTOOL_DEPS@
239+
LIB_CC_FLAGS = @LIB_CC_FLAGS@
239240
LIPO = @LIPO@
240241
LN_S = @LN_S@
241242
LTLIBOBJS = @LTLIBOBJS@

‎aldor/lib/aldor/Makefile.in

+1
Original file line numberDiff line numberDiff line change
@@ -236,6 +236,7 @@ LIBOBJS = @LIBOBJS@
236236
LIBS = @LIBS@
237237
LIBTOOL = @LIBTOOL@
238238
LIBTOOL_DEPS = @LIBTOOL_DEPS@
239+
LIB_CC_FLAGS = @LIB_CC_FLAGS@
239240
LIPO = @LIPO@
240241
LN_S = @LN_S@
241242
LTLIBOBJS = @LTLIBOBJS@

‎aldor/lib/aldor/doc/Makefile.in

+1
Original file line numberDiff line numberDiff line change
@@ -237,6 +237,7 @@ LIBOBJS = @LIBOBJS@
237237
LIBS = @LIBS@
238238
LIBTOOL = @LIBTOOL@
239239
LIBTOOL_DEPS = @LIBTOOL_DEPS@
240+
LIB_CC_FLAGS = @LIB_CC_FLAGS@
240241
LIPO = @LIPO@
241242
LN_S = @LN_S@
242243
LTLIBOBJS = @LTLIBOBJS@

‎aldor/lib/aldor/include/Makefile.in

+1
Original file line numberDiff line numberDiff line change
@@ -208,6 +208,7 @@ LIBOBJS = @LIBOBJS@
208208
LIBS = @LIBS@
209209
LIBTOOL = @LIBTOOL@
210210
LIBTOOL_DEPS = @LIBTOOL_DEPS@
211+
LIB_CC_FLAGS = @LIB_CC_FLAGS@
211212
LIPO = @LIPO@
212213
LN_S = @LN_S@
213214
LTLIBOBJS = @LTLIBOBJS@

‎aldor/lib/aldor/src/Makefile.in

+2-1
Original file line numberDiff line numberDiff line change
@@ -435,6 +435,7 @@ LIBOBJS = @LIBOBJS@
435435
LIBS = @LIBS@
436436
LIBTOOL = @LIBTOOL@
437437
LIBTOOL_DEPS = @LIBTOOL_DEPS@
438+
LIB_CC_FLAGS = @LIB_CC_FLAGS@
438439
LIPO = @LIPO@
439440
LN_S = @LN_S@
440441
LTLIBOBJS = @LTLIBOBJS@
@@ -629,7 +630,7 @@ am__v_LIBSRCJAR_0 = @echo " LIBSRCJAR " $@;
629630
AM_V_PREREQ = $(am__v_PREREQ_$(V))
630631
am__v_PREREQ_ = $(am__v_PREREQ_$(AM_DEFAULT_VERBOSITY))
631632
am__v_PREREQ_0 = @echo " PREREQ " $@;
632-
AM_CFLAGS = -I$(aldorsrcdir)
633+
AM_CFLAGS = -I$(aldorsrcdir) $(LIB_CC_FLAGS)
633634
CLEANFILES = lib$(libraryname).al $(datalib_DATA)
634635
eq = $(and $(findstring $1,$2),$(findstring $2,$1))
635636
lst_prefix = $(warning 1 $1 2 $2)$(if $(or $(if $2,,xx), $(call eq,$1,$(firstword $2))),,$(firstword $2) $(call lst_prefix,$1,$(wordlist 2,$(words $2),$2)))

‎aldor/lib/aldor/test/Makefile.in

+2
Original file line numberDiff line numberDiff line change
@@ -901,6 +901,7 @@ LIBOBJS = @LIBOBJS@
901901
LIBS = @LIBS@
902902
LIBTOOL = @LIBTOOL@
903903
LIBTOOL_DEPS = @LIBTOOL_DEPS@
904+
LIB_CC_FLAGS = @LIB_CC_FLAGS@
904905
LIPO = @LIPO@
905906
LN_S = @LN_S@
906907
LTLIBOBJS = @LTLIBOBJS@
@@ -1063,6 +1064,7 @@ ALDORFLAGS := \
10631064
-Waudit -Wcheck \
10641065
$(ALFLAGS)
10651066

1067+
AM_CFLAGS = $(LIB_CC_FLAGS)
10661068

10671069
# Aldor silent-rules
10681070
AM_V_ALDOR = $(am__v_ALDOR_$(V))

‎aldor/lib/algebra/Makefile.in

+1
Original file line numberDiff line numberDiff line change
@@ -236,6 +236,7 @@ LIBOBJS = @LIBOBJS@
236236
LIBS = @LIBS@
237237
LIBTOOL = @LIBTOOL@
238238
LIBTOOL_DEPS = @LIBTOOL_DEPS@
239+
LIB_CC_FLAGS = @LIB_CC_FLAGS@
239240
LIPO = @LIPO@
240241
LN_S = @LN_S@
241242
LTLIBOBJS = @LTLIBOBJS@

‎aldor/lib/algebra/doc/Makefile.in

+1
Original file line numberDiff line numberDiff line change
@@ -237,6 +237,7 @@ LIBOBJS = @LIBOBJS@
237237
LIBS = @LIBS@
238238
LIBTOOL = @LIBTOOL@
239239
LIBTOOL_DEPS = @LIBTOOL_DEPS@
240+
LIB_CC_FLAGS = @LIB_CC_FLAGS@
240241
LIPO = @LIPO@
241242
LN_S = @LN_S@
242243
LTLIBOBJS = @LTLIBOBJS@

‎aldor/lib/algebra/include/Makefile.in

+1
Original file line numberDiff line numberDiff line change
@@ -208,6 +208,7 @@ LIBOBJS = @LIBOBJS@
208208
LIBS = @LIBS@
209209
LIBTOOL = @LIBTOOL@
210210
LIBTOOL_DEPS = @LIBTOOL_DEPS@
211+
LIB_CC_FLAGS = @LIB_CC_FLAGS@
211212
LIPO = @LIPO@
212213
LN_S = @LN_S@
213214
LTLIBOBJS = @LTLIBOBJS@

‎aldor/lib/algebra/src/Makefile.in

+2-1
Original file line numberDiff line numberDiff line change
@@ -818,6 +818,7 @@ LIBOBJS = @LIBOBJS@
818818
LIBS = @LIBS@
819819
LIBTOOL = @LIBTOOL@
820820
LIBTOOL_DEPS = @LIBTOOL_DEPS@
821+
LIB_CC_FLAGS = @LIB_CC_FLAGS@
821822
LIPO = @LIPO@
822823
LN_S = @LN_S@
823824
LTLIBOBJS = @LTLIBOBJS@
@@ -1084,7 +1085,7 @@ am__v_LIBSRCJAR_0 = @echo " LIBSRCJAR " $@;
10841085
AM_V_PREREQ = $(am__v_PREREQ_$(V))
10851086
am__v_PREREQ_ = $(am__v_PREREQ_$(AM_DEFAULT_VERBOSITY))
10861087
am__v_PREREQ_0 = @echo " PREREQ " $@;
1087-
AM_CFLAGS = -I$(aldorsrcdir)
1088+
AM_CFLAGS = -I$(aldorsrcdir) $(LIB_CC_FLAGS)
10881089
CLEANFILES = lib$(libraryname).al
10891090
eq = $(and $(findstring $1,$2),$(findstring $2,$1))
10901091
lst_prefix = $(warning 1 $1 2 $2)$(if $(or $(if $2,,xx), $(call eq,$1,$(firstword $2))),,$(firstword $2) $(call lst_prefix,$1,$(wordlist 2,$(words $2),$2)))

‎aldor/lib/algebra/test/Makefile.in

+2
Original file line numberDiff line numberDiff line change
@@ -579,6 +579,7 @@ LIBOBJS = @LIBOBJS@
579579
LIBS = @LIBS@
580580
LIBTOOL = @LIBTOOL@
581581
LIBTOOL_DEPS = @LIBTOOL_DEPS@
582+
LIB_CC_FLAGS = @LIB_CC_FLAGS@
582583
LIPO = @LIPO@
583584
LN_S = @LN_S@
584585
LTLIBOBJS = @LTLIBOBJS@
@@ -707,6 +708,7 @@ ALDORFLAGS := \
707708
-Waudit -Wcheck \
708709
$(ALFLAGS)
709710

711+
AM_CFLAGS = $(LIB_CC_FLAGS)
710712

711713
# Aldor silent-rules
712714
AM_V_ALDOR = $(am__v_ALDOR_$(V))

‎aldor/lib/ax0/Makefile.in

+1
Original file line numberDiff line numberDiff line change
@@ -236,6 +236,7 @@ LIBOBJS = @LIBOBJS@
236236
LIBS = @LIBS@
237237
LIBTOOL = @LIBTOOL@
238238
LIBTOOL_DEPS = @LIBTOOL_DEPS@
239+
LIB_CC_FLAGS = @LIB_CC_FLAGS@
239240
LIPO = @LIPO@
240241
LN_S = @LN_S@
241242
LTLIBOBJS = @LTLIBOBJS@

‎aldor/lib/ax0/include/Makefile.in

+1
Original file line numberDiff line numberDiff line change
@@ -208,6 +208,7 @@ LIBOBJS = @LIBOBJS@
208208
LIBS = @LIBS@
209209
LIBTOOL = @LIBTOOL@
210210
LIBTOOL_DEPS = @LIBTOOL_DEPS@
211+
LIB_CC_FLAGS = @LIB_CC_FLAGS@
211212
LIPO = @LIPO@
212213
LN_S = @LN_S@
213214
LTLIBOBJS = @LTLIBOBJS@

‎aldor/lib/ax0/src/Makefile.in

+2-1
Original file line numberDiff line numberDiff line change
@@ -266,6 +266,7 @@ LIBOBJS = @LIBOBJS@
266266
LIBS = @LIBS@
267267
LIBTOOL = @LIBTOOL@
268268
LIBTOOL_DEPS = @LIBTOOL_DEPS@
269+
LIB_CC_FLAGS = @LIB_CC_FLAGS@
269270
LIPO = @LIPO@
270271
LN_S = @LN_S@
271272
LTLIBOBJS = @LTLIBOBJS@
@@ -371,7 +372,7 @@ am__v_LIBSRCJAR_0 = @echo " LIBSRCJAR " $@;
371372
AM_V_PREREQ = $(am__v_PREREQ_$(V))
372373
am__v_PREREQ_ = $(am__v_PREREQ_$(AM_DEFAULT_VERBOSITY))
373374
am__v_PREREQ_0 = @echo " PREREQ " $@;
374-
AM_CFLAGS = -I$(aldorsrcdir)
375+
AM_CFLAGS = -I$(aldorsrcdir) $(LIB_CC_FLAGS)
375376
CLEANFILES = lib$(libraryname).al
376377
eq = $(and $(findstring $1,$2),$(findstring $2,$1))
377378
lst_prefix = $(warning 1 $1 2 $2)$(if $(or $(if $2,,xx), $(call eq,$1,$(firstword $2))),,$(firstword $2) $(call lst_prefix,$1,$(wordlist 2,$(words $2),$2)))

‎aldor/lib/ax0/test/Makefile.in

+1
Original file line numberDiff line numberDiff line change
@@ -380,6 +380,7 @@ LIBOBJS = @LIBOBJS@
380380
LIBS = @LIBS@
381381
LIBTOOL = @LIBTOOL@
382382
LIBTOOL_DEPS = @LIBTOOL_DEPS@
383+
LIB_CC_FLAGS = @LIB_CC_FLAGS@
383384
LIPO = @LIPO@
384385
LN_S = @LN_S@
385386
LTLIBOBJS = @LTLIBOBJS@

‎aldor/lib/axldem/Makefile.in

+1
Original file line numberDiff line numberDiff line change
@@ -236,6 +236,7 @@ LIBOBJS = @LIBOBJS@
236236
LIBS = @LIBS@
237237
LIBTOOL = @LIBTOOL@
238238
LIBTOOL_DEPS = @LIBTOOL_DEPS@
239+
LIB_CC_FLAGS = @LIB_CC_FLAGS@
239240
LIPO = @LIPO@
240241
LN_S = @LN_S@
241242
LTLIBOBJS = @LTLIBOBJS@

‎aldor/lib/axldem/include/Makefile.in

+1
Original file line numberDiff line numberDiff line change
@@ -208,6 +208,7 @@ LIBOBJS = @LIBOBJS@
208208
LIBS = @LIBS@
209209
LIBTOOL = @LIBTOOL@
210210
LIBTOOL_DEPS = @LIBTOOL_DEPS@
211+
LIB_CC_FLAGS = @LIB_CC_FLAGS@
211212
LIPO = @LIPO@
212213
LN_S = @LN_S@
213214
LTLIBOBJS = @LTLIBOBJS@

‎aldor/lib/axldem/src/Makefile.in

+2-1
Original file line numberDiff line numberDiff line change
@@ -317,6 +317,7 @@ LIBOBJS = @LIBOBJS@
317317
LIBS = @LIBS@
318318
LIBTOOL = @LIBTOOL@
319319
LIBTOOL_DEPS = @LIBTOOL_DEPS@
320+
LIB_CC_FLAGS = @LIB_CC_FLAGS@
320321
LIPO = @LIPO@
321322
LN_S = @LN_S@
322323
LTLIBOBJS = @LTLIBOBJS@
@@ -440,7 +441,7 @@ am__v_LIBSRCJAR_0 = @echo " LIBSRCJAR " $@;
440441
AM_V_PREREQ = $(am__v_PREREQ_$(V))
441442
am__v_PREREQ_ = $(am__v_PREREQ_$(AM_DEFAULT_VERBOSITY))
442443
am__v_PREREQ_0 = @echo " PREREQ " $@;
443-
AM_CFLAGS = -I$(aldorsrcdir)
444+
AM_CFLAGS = -I$(aldorsrcdir) $(LIB_CC_FLAGS)
444445
CLEANFILES = lib$(libraryname).al
445446
eq = $(and $(findstring $1,$2),$(findstring $2,$1))
446447
lst_prefix = $(warning 1 $1 2 $2)$(if $(or $(if $2,,xx), $(call eq,$1,$(firstword $2))),,$(firstword $2) $(call lst_prefix,$1,$(wordlist 2,$(words $2),$2)))

0 commit comments

Comments
 (0)