From d7fcd8e57b9f1b98524395ce3756678efb36e214 Mon Sep 17 00:00:00 2001 From: Mohamed Akram Date: Fri, 28 Apr 2017 16:01:09 +0400 Subject: [PATCH] Add CC option to configure original commit: 1a65f0bef4c2af6016c328f7f1151e6d10e342fa --- LOG | 1 + c/Mf-a6fb | 8 ++++---- c/Mf-a6le | 8 ++++---- c/Mf-a6nb | 8 ++++---- c/Mf-a6ob | 8 ++++---- c/Mf-a6osx | 2 +- c/Mf-a6s2 | 8 ++++---- c/Mf-arm32le | 8 ++++---- c/Mf-i3fb | 8 ++++---- c/Mf-i3le | 8 ++++---- c/Mf-i3nb | 8 ++++---- c/Mf-i3ob | 8 ++++---- c/Mf-i3osx | 8 ++++---- c/Mf-i3s2 | 8 ++++---- c/Mf-ppc32le | 8 ++++---- c/Mf-ta6fb | 8 ++++---- c/Mf-ta6le | 8 ++++---- c/Mf-ta6nb | 8 ++++---- c/Mf-ta6ob | 8 ++++---- c/Mf-ta6osx | 2 +- c/Mf-ta6s2 | 8 ++++---- c/Mf-ti3fb | 8 ++++---- c/Mf-ti3le | 8 ++++---- c/Mf-ti3nb | 8 ++++---- c/Mf-ti3ob | 8 ++++---- c/Mf-ti3osx | 8 ++++---- c/Mf-ti3s2 | 8 ++++---- c/Mf-tppc32le | 8 ++++---- configure | 5 +++++ 29 files changed, 108 insertions(+), 102 deletions(-) diff --git a/LOG b/LOG index 756badf8f3..e9de335b03 100644 --- a/LOG +++ b/LOG @@ -450,3 +450,4 @@ Also add a simplification for for-each with empty lists with optimization level 2. cp0.ss, 4.ms, primdata.ss +- added CC option to configure for selecting the compiler diff --git a/c/Mf-a6fb b/c/Mf-a6fb index 637a2c2cc2..9a55d7ae89 100644 --- a/c/Mf-a6fb +++ b/c/Mf-a6fb @@ -1,12 +1,12 @@ # Mf-a6fb # Copyright 1984-2017 Cisco Systems, Inc. -# +# # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at -# +# # http://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -18,7 +18,7 @@ Cpu = X86_64 mdinclude = -I/usr/local/include -I/usr/X11R6/include mdclib = -L/usr/local/lib -liconv -lm -lncurses -C = gcc ${CPPFLAGS} -Wpointer-arith -Wextra -Werror -O ${CFLAGS} +C = ${CC} ${CPPFLAGS} -Wpointer-arith -Wextra -Werror -O ${CFLAGS} o = o mdsrc = i3le.c mdobj = i3le.o diff --git a/c/Mf-a6le b/c/Mf-a6le index d5b9281a22..7ee9e56d74 100644 --- a/c/Mf-a6le +++ b/c/Mf-a6le @@ -1,12 +1,12 @@ # Mf-a6le # Copyright 1984-2017 Cisco Systems, Inc. -# +# # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at -# +# # http://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -17,7 +17,7 @@ m = a6le Cpu = X86_64 mdclib = -lm -ldl -lncurses -lrt -C = gcc ${CPPFLAGS} -m64 -msse2 -Wpointer-arith -Wall -Wextra -Werror -O2 ${CFLAGS} +C = ${CC} ${CPPFLAGS} -m64 -msse2 -Wpointer-arith -Wall -Wextra -Werror -O2 ${CFLAGS} o = o mdsrc = i3le.c mdobj = i3le.o diff --git a/c/Mf-a6nb b/c/Mf-a6nb index 01ed4c9db8..f3869b360e 100644 --- a/c/Mf-a6nb +++ b/c/Mf-a6nb @@ -1,12 +1,12 @@ # Mf-a6nb # Copyright 1984-2017 Cisco Systems, Inc. -# +# # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at -# +# # http://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -18,7 +18,7 @@ Cpu = X86_64 mdinclude = -I/usr/X11R7/include -I/usr/pkg/include -I/usr/pkg/include/ncurses -I/usr/local/include -I/usr/X11R6/include mdclib = /usr/lib/i18n/libiconv_std.a -lm /usr/pkg/lib/libncurses.a -C = gcc ${CPPFLAGS} -m64 -Wpointer-arith -Wextra -Werror -O ${CFLAGS} +C = ${CC} ${CPPFLAGS} -m64 -Wpointer-arith -Wextra -Werror -O ${CFLAGS} o = o mdsrc = i3le.c mdobj = i3le.o diff --git a/c/Mf-a6ob b/c/Mf-a6ob index ad35c55921..03ab059065 100644 --- a/c/Mf-a6ob +++ b/c/Mf-a6ob @@ -1,12 +1,12 @@ # Mf-a6ob # Copyright 1984-2017 Cisco Systems, Inc. -# +# # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at -# +# # http://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -18,7 +18,7 @@ Cpu = X86_64 mdinclude = -I/usr/local/include -I/usr/X11R6/include mdclib = -L/usr/local/lib -liconv -lm -lncurses -C = gcc ${CPPFLAGS} -Wpointer-arith -Werror -O ${CFLAGS} +C = ${CC} ${CPPFLAGS} -Wpointer-arith -Werror -O ${CFLAGS} o = o mdsrc = i3le.c mdobj = i3le.o diff --git a/c/Mf-a6osx b/c/Mf-a6osx index b9dc729fb3..fe0756b378 100644 --- a/c/Mf-a6osx +++ b/c/Mf-a6osx @@ -17,7 +17,7 @@ m = a6osx Cpu = X86_64 mdclib = -liconv -lm -lncurses -C = gcc ${CPPFLAGS} -m64 -Wpointer-arith -Wall -Wextra -Werror -O2 -I/opt/X11/include/ ${CFLAGS} +C = ${CC} ${CPPFLAGS} -m64 -Wpointer-arith -Wall -Wextra -Werror -O2 -I/opt/X11/include/ ${CFLAGS} o = o mdsrc = i3le.c mdobj = i3le.o diff --git a/c/Mf-a6s2 b/c/Mf-a6s2 index cb35ec2a68..6d172cc73b 100644 --- a/c/Mf-a6s2 +++ b/c/Mf-a6s2 @@ -1,12 +1,12 @@ # Mf-a6s2 # Copyright 1984-2017 Cisco Systems, Inc. -# +# # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at -# +# # http://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -17,7 +17,7 @@ m = a6s2 Cpu = X86_64 mdclib = -lnsl -ldl -lm -lcurses -lrt -C = gcc ${CPPFLAGS} -m64 -Wpointer-arith -Wextra -Werror -O ${CFLAGS} +C = ${CC} ${CPPFLAGS} -m64 -Wpointer-arith -Wextra -Werror -O ${CFLAGS} o = o mdsrc = i3le.c mdobj = i3le.o diff --git a/c/Mf-arm32le b/c/Mf-arm32le index da2e03a806..4ef3a9fee1 100644 --- a/c/Mf-arm32le +++ b/c/Mf-arm32le @@ -1,12 +1,12 @@ # Mf-arm32le # Copyright 1984-2017 Cisco Systems, Inc. -# +# # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at -# +# # http://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -17,7 +17,7 @@ m = arm32le Cpu = ARMV6 mdclib = -lm -ldl -lncurses -lrt -C = gcc ${CPPFLAGS} -Wpointer-arith -Wextra -Werror -O2 ${CFLAGS} +C = ${CC} ${CPPFLAGS} -Wpointer-arith -Wextra -Werror -O2 ${CFLAGS} o = o mdsrc = arm32le.c mdobj = arm32le.o diff --git a/c/Mf-i3fb b/c/Mf-i3fb index 1f95d66857..834d8ab846 100644 --- a/c/Mf-i3fb +++ b/c/Mf-i3fb @@ -1,12 +1,12 @@ # Mf-i3fb # Copyright 1984-2017 Cisco Systems, Inc. -# +# # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at -# +# # http://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -18,7 +18,7 @@ Cpu = I386 mdinclude = -I/usr/local/include -I/usr/X11R6/include mdclib = -L/usr/local/lib -liconv -lm -lncurses -C = gcc ${CPPFLAGS} -Wpointer-arith -Wextra -Werror -O ${CFLAGS} +C = ${CC} ${CPPFLAGS} -Wpointer-arith -Wextra -Werror -O ${CFLAGS} o = o mdsrc = i3le.c mdobj = i3le.o diff --git a/c/Mf-i3le b/c/Mf-i3le index 3113feb56d..25b8541881 100644 --- a/c/Mf-i3le +++ b/c/Mf-i3le @@ -1,12 +1,12 @@ # Mf-i3le # Copyright 1984-2017 Cisco Systems, Inc. -# +# # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at -# +# # http://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -17,7 +17,7 @@ m = i3le Cpu = I386 mdclib = -lm -ldl -lncurses -lrt -C = gcc ${CPPFLAGS} -m32 -msse2 -Wpointer-arith -Wall -Wextra -Werror -O2 -fno-stack-protector ${CFLAGS} +C = ${CC} ${CPPFLAGS} -m32 -msse2 -Wpointer-arith -Wall -Wextra -Werror -O2 -fno-stack-protector ${CFLAGS} o = o mdsrc = i3le.c mdobj = i3le.o diff --git a/c/Mf-i3nb b/c/Mf-i3nb index 27fe7a0ecd..f7378865c1 100644 --- a/c/Mf-i3nb +++ b/c/Mf-i3nb @@ -1,12 +1,12 @@ # Mf-i3nb # Copyright 1984-2017 Cisco Systems, Inc. -# +# # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at -# +# # http://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -18,7 +18,7 @@ Cpu = I386 mdinclude = -I/usr/X11R7/include -I/usr/pkg/include -I/usr/pkg/include/ncurses -I/usr/X11R6/include mdclib = /usr/lib/i18n/libiconv_std.a -lm /usr/pkg/lib/libncurses.a -C = gcc ${CPPFLAGS} -Wpointer-arith -Wextra -Werror -O ${CFLAGS} +C = ${CC} ${CPPFLAGS} -Wpointer-arith -Wextra -Werror -O ${CFLAGS} o = o mdsrc = i3le.c mdobj = i3le.o diff --git a/c/Mf-i3ob b/c/Mf-i3ob index 06753044e5..ee9ceec21b 100644 --- a/c/Mf-i3ob +++ b/c/Mf-i3ob @@ -1,12 +1,12 @@ # Mf-i3ob # Copyright 1984-2017 Cisco Systems, Inc. -# +# # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at -# +# # http://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -18,7 +18,7 @@ Cpu = I386 mdinclude = -I/usr/local/include -I/usr/X11R6/include mdclib = -L/usr/local/lib -liconv -lm -lncurses -C = gcc ${CPPFLAGS} -Wpointer-arith -Werror -O ${CFLAGS} +C = ${CC} ${CPPFLAGS} -Wpointer-arith -Werror -O ${CFLAGS} o = o mdsrc = i3le.c mdobj = i3le.o diff --git a/c/Mf-i3osx b/c/Mf-i3osx index 58c1039faf..833cea7ee0 100644 --- a/c/Mf-i3osx +++ b/c/Mf-i3osx @@ -1,12 +1,12 @@ # Mf-i3osx # Copyright 1984-2017 Cisco Systems, Inc. -# +# # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at -# +# # http://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -17,7 +17,7 @@ m = i3osx Cpu = I386 mdclib = -liconv -lm -lncurses -C = gcc ${CPPFLAGS} -m32 -Wpointer-arith -Wall -Wextra -Werror -O2 -msse2 -I/opt/X11/include/ ${CFLAGS} +C = ${CC} ${CPPFLAGS} -m32 -Wpointer-arith -Wall -Wextra -Werror -O2 -msse2 -I/opt/X11/include/ ${CFLAGS} o = o mdsrc = i3le.c mdobj = i3le.o diff --git a/c/Mf-i3s2 b/c/Mf-i3s2 index 29cc0ffbb9..7f2c52963d 100644 --- a/c/Mf-i3s2 +++ b/c/Mf-i3s2 @@ -1,12 +1,12 @@ # Mf-i3s2 # Copyright 1984-2017 Cisco Systems, Inc. -# +# # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at -# +# # http://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -17,7 +17,7 @@ m = i3s2 Cpu = I386 mdclib = -lnsl -ldl -lm -lcurses -lrt -C = gcc ${CFLAGS} -m32 -Wpointer-arith -Wextra -Werror -O ${CPPFLAGS} +C = ${CC} ${CFLAGS} -m32 -Wpointer-arith -Wextra -Werror -O ${CPPFLAGS} o = o mdsrc = i3le.c mdobj = i3le.o diff --git a/c/Mf-ppc32le b/c/Mf-ppc32le index 62bac563f4..b18c38ed74 100644 --- a/c/Mf-ppc32le +++ b/c/Mf-ppc32le @@ -1,12 +1,12 @@ # Mf-ppc32le # Copyright 1984-2017 Cisco Systems, Inc. -# +# # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at -# +# # http://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -17,7 +17,7 @@ m = ppc32le Cpu = PPC32 mdclib = -lm -ldl -lncurses -lrt -C = gcc ${CPPFLAGS} -m32 -Wpointer-arith -Wextra -Werror -O2 ${CFLAGS} +C = ${CC} ${CPPFLAGS} -m32 -Wpointer-arith -Wextra -Werror -O2 ${CFLAGS} o = o mdsrc = ppc32.c mdobj = ppc32.o diff --git a/c/Mf-ta6fb b/c/Mf-ta6fb index 9c3e28b633..81800dcacc 100644 --- a/c/Mf-ta6fb +++ b/c/Mf-ta6fb @@ -1,12 +1,12 @@ # Mf-ta6fb # Copyright 1984-2017 Cisco Systems, Inc. -# +# # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at -# +# # http://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -18,7 +18,7 @@ Cpu = X86_64 mdinclude = -I/usr/local/include -I/usr/X11R6/include mdclib = -L/usr/local/lib -liconv -lm -lncurses -lpthread -C = gcc ${CPPFLAGS} -Wpointer-arith -Wextra -Werror -O2 -D_REENTRANT -pthread ${CFLAGS} +C = ${CC} ${CPPFLAGS} -Wpointer-arith -Wextra -Werror -O2 -D_REENTRANT -pthread ${CFLAGS} o = o mdsrc = i3le.c mdobj = i3le.o diff --git a/c/Mf-ta6le b/c/Mf-ta6le index eb443c2b97..d7d5f30e42 100644 --- a/c/Mf-ta6le +++ b/c/Mf-ta6le @@ -1,12 +1,12 @@ # Mf-ta6le # Copyright 1984-2017 Cisco Systems, Inc. -# +# # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at -# +# # http://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -17,7 +17,7 @@ m = ta6le Cpu = X86_64 mdclib = -lm -ldl -lncurses -lpthread -lrt -C = gcc ${CPPFLAGS} -m64 -msse2 -Wpointer-arith -Wall -Wextra -Werror -O2 -D_REENTRANT -pthread ${CFLAGS} +C = ${CC} ${CPPFLAGS} -m64 -msse2 -Wpointer-arith -Wall -Wextra -Werror -O2 -D_REENTRANT -pthread ${CFLAGS} o = o mdsrc = i3le.c mdobj = i3le.o diff --git a/c/Mf-ta6nb b/c/Mf-ta6nb index 02ce0f3b4d..6dbd83c74a 100644 --- a/c/Mf-ta6nb +++ b/c/Mf-ta6nb @@ -1,12 +1,12 @@ # Mf-ta6nb # Copyright 1984-2017 Cisco Systems, Inc. -# +# # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at -# +# # http://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -18,7 +18,7 @@ Cpu = X86_64 mdinclude = -I/usr/X11R7/include -I/usr/pkg/include -I/usr/pkg/include/ncurses -I/usr/X11R6/include mdclib = /usr/lib/i18n/libiconv_std.a -lm /usr/pkg/lib/libncurses.a -lpthread -C = gcc ${CPPFLAGS} -m64 -Wpointer-arith -Wextra -Werror -O2 -D_REENTRANT -pthread ${CFLAGS} +C = ${CC} ${CPPFLAGS} -m64 -Wpointer-arith -Wextra -Werror -O2 -D_REENTRANT -pthread ${CFLAGS} o = o mdsrc = i3le.c mdobj = i3le.o diff --git a/c/Mf-ta6ob b/c/Mf-ta6ob index 617517e653..45e29e8955 100644 --- a/c/Mf-ta6ob +++ b/c/Mf-ta6ob @@ -1,12 +1,12 @@ # Mf-ta6ob # Copyright 1984-2017 Cisco Systems, Inc. -# +# # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at -# +# # http://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -18,7 +18,7 @@ Cpu = X86_64 mdinclude = -I/usr/local/include -I/usr/X11R6/include mdclib = -L/usr/local/lib -liconv -lm -lncurses -lpthread -C = gcc ${CPPFLAGS} -Wpointer-arith -Werror -O2 -D_REENTRANT -pthread ${CFLAGS} +C = ${CC} ${CPPFLAGS} -Wpointer-arith -Werror -O2 -D_REENTRANT -pthread ${CFLAGS} o = o mdsrc = i3le.c mdobj = i3le.o diff --git a/c/Mf-ta6osx b/c/Mf-ta6osx index d6a6002aac..15fe45b375 100644 --- a/c/Mf-ta6osx +++ b/c/Mf-ta6osx @@ -17,7 +17,7 @@ m = ta6osx Cpu = X86_64 mdclib = -liconv -lm -lncurses -C = gcc ${CPPFLAGS} -m64 -Wpointer-arith -Wall -Wextra -Werror -O2 -I/opt/X11/include/ ${CFLAGS} +C = ${CC} ${CPPFLAGS} -m64 -Wpointer-arith -Wall -Wextra -Werror -O2 -I/opt/X11/include/ ${CFLAGS} o = o mdsrc = i3le.c mdobj = i3le.o diff --git a/c/Mf-ta6s2 b/c/Mf-ta6s2 index d31c08165a..ed260d054c 100644 --- a/c/Mf-ta6s2 +++ b/c/Mf-ta6s2 @@ -1,12 +1,12 @@ # Mf-ta6s2 # Copyright 1984-2017 Cisco Systems, Inc. -# +# # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at -# +# # http://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -17,7 +17,7 @@ m = ta6s2 Cpu = X86_64 mdclib = -lnsl -ldl -lm -lpthread -lcurses -lrt -C = gcc ${CPPFLAGS} -m64 -Wpointer-arith -Wextra -Werror -O2 -D_REENTRANT ${CFLAGS} +C = ${CC} ${CPPFLAGS} -m64 -Wpointer-arith -Wextra -Werror -O2 -D_REENTRANT ${CFLAGS} o = o mdsrc = i3le.c mdobj = i3le.o diff --git a/c/Mf-ti3fb b/c/Mf-ti3fb index 589607bb97..58af09cfcd 100644 --- a/c/Mf-ti3fb +++ b/c/Mf-ti3fb @@ -1,12 +1,12 @@ # Mf-ti3fb # Copyright 1984-2017 Cisco Systems, Inc. -# +# # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at -# +# # http://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -18,7 +18,7 @@ Cpu = I386 mdinclude = -I/usr/local/include -I/usr/X11R6/include mdclib = -L/usr/local/lib -liconv -lm -lncurses -lpthread -C = gcc ${CPPFLAGS} -Wpointer-arith -Wextra -Werror -O2 -D_REENTRANT -pthread ${CFLAGS} +C = ${CC} ${CPPFLAGS} -Wpointer-arith -Wextra -Werror -O2 -D_REENTRANT -pthread ${CFLAGS} o = o mdsrc = i3le.c mdobj = i3le.o diff --git a/c/Mf-ti3le b/c/Mf-ti3le index 2b284eac51..98c183fa1b 100644 --- a/c/Mf-ti3le +++ b/c/Mf-ti3le @@ -1,12 +1,12 @@ # Mf-ti3le # Copyright 1984-2017 Cisco Systems, Inc. -# +# # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at -# +# # http://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -17,7 +17,7 @@ m = ti3le Cpu = I386 mdclib = -lm -ldl -lncurses -lpthread -lrt -C = gcc ${CPPFLAGS} -m32 -msse2 -Wpointer-arith -Wall -Wextra -Werror -O2 -D_REENTRANT -pthread ${CFLAGS} +C = ${CC} ${CPPFLAGS} -m32 -msse2 -Wpointer-arith -Wall -Wextra -Werror -O2 -D_REENTRANT -pthread ${CFLAGS} o = o mdsrc = i3le.c mdobj = i3le.o diff --git a/c/Mf-ti3nb b/c/Mf-ti3nb index 528e7526ee..fd102dce25 100644 --- a/c/Mf-ti3nb +++ b/c/Mf-ti3nb @@ -1,12 +1,12 @@ # Mf-ti3nb # Copyright 1984-2017 Cisco Systems, Inc. -# +# # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at -# +# # http://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -18,7 +18,7 @@ Cpu = I386 mdinclude = -I/usr/X11R7/include -I/usr/pkg/include -I/usr/pkg/include/ncurses -I/usr/X11R6/include mdclib = /usr/lib/i18n/libiconv_std.a -lm /usr/pkg/lib/libncurses.a -lpthread -C = gcc ${CPPFLAGS} -m32 -Wpointer-arith -Wextra -Werror -O2 -D_REENTRANT -pthread ${CFLAGS} +C = ${CC} ${CPPFLAGS} -m32 -Wpointer-arith -Wextra -Werror -O2 -D_REENTRANT -pthread ${CFLAGS} o = o mdsrc = i3le.c mdobj = i3le.o diff --git a/c/Mf-ti3ob b/c/Mf-ti3ob index 418b729f32..b6b529fd91 100644 --- a/c/Mf-ti3ob +++ b/c/Mf-ti3ob @@ -1,12 +1,12 @@ # Mf-ti3ob # Copyright 1984-2017 Cisco Systems, Inc. -# +# # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at -# +# # http://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -18,7 +18,7 @@ Cpu = I386 mdinclude = -I/usr/local/include -I/usr/X11R6/include mdclib = -L/usr/local/lib -liconv -lm -lncurses -lpthread -C = gcc ${CPPFLAGS} -Wpointer-arith -Werror -O2 -D_REENTRANT -pthread ${CFLAGS} +C = ${CC} ${CPPFLAGS} -Wpointer-arith -Werror -O2 -D_REENTRANT -pthread ${CFLAGS} o = o mdsrc = i3le.c mdobj = i3le.o diff --git a/c/Mf-ti3osx b/c/Mf-ti3osx index 83e48af325..27d3e62bfc 100644 --- a/c/Mf-ti3osx +++ b/c/Mf-ti3osx @@ -1,12 +1,12 @@ # Mf-ti3osx # Copyright 1984-2017 Cisco Systems, Inc. -# +# # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at -# +# # http://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -17,7 +17,7 @@ m = ti3osx Cpu = I386 mdclib = -liconv -lm -lncurses -C = gcc ${CPPFLAGS} -m32 -Wpointer-arith -Wall -Wextra -Werror -O2 -msse2 -I/opt/X11/include/ ${CFLAGS} +C = ${CC} ${CPPFLAGS} -m32 -Wpointer-arith -Wall -Wextra -Werror -O2 -msse2 -I/opt/X11/include/ ${CFLAGS} o = o mdsrc = i3le.c mdobj = i3le.o diff --git a/c/Mf-ti3s2 b/c/Mf-ti3s2 index 3d0b128251..2f9ec15e5f 100644 --- a/c/Mf-ti3s2 +++ b/c/Mf-ti3s2 @@ -1,12 +1,12 @@ # Mf-ti3s2 # Copyright 1984-2017 Cisco Systems, Inc. -# +# # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at -# +# # http://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -17,7 +17,7 @@ m = ti3s2 Cpu = I386 mdclib = -lnsl -ldl -lm -lpthread -lcurses -lrt -C = gcc ${CPPFLAGS} -m32 -Wpointer-arith -Wextra -Werror -O2 -D_REENTRANT ${CFLAGS} +C = ${CC} ${CPPFLAGS} -m32 -Wpointer-arith -Wextra -Werror -O2 -D_REENTRANT ${CFLAGS} o = o mdsrc = i3le.c mdobj = i3le.o diff --git a/c/Mf-tppc32le b/c/Mf-tppc32le index 074546d949..73fe9d5746 100644 --- a/c/Mf-tppc32le +++ b/c/Mf-tppc32le @@ -1,12 +1,12 @@ # Mf-tppc32le # Copyright 1984-2017 Cisco Systems, Inc. -# +# # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at -# +# # http://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -17,7 +17,7 @@ m = tppc32le Cpu = PPC32 mdclib = -lm -ldl -lncurses -lpthread -lrt -C = gcc ${CPPFLAGS} -m32 -Wpointer-arith -Wextra -Werror -O2 -D_REENTRANT -pthread ${CFLAGS} +C = ${CC} ${CPPFLAGS} -m32 -Wpointer-arith -Wextra -Werror -O2 -D_REENTRANT -pthread ${CFLAGS} o = o mdsrc = ppc32le.c mdobj = ppc32le.o diff --git a/configure b/configure index 577b3b4003..e0a86a6168 100755 --- a/configure +++ b/configure @@ -37,6 +37,7 @@ installman="" installschemename="scheme" installpetitename="petite" installscriptname="scheme-script" +: ${CC:="gcc"} : ${CPPFLAGS:=""} : ${CFLAGS:=""} : ${LDFLAGS:=""} @@ -191,6 +192,9 @@ while [ $# != 0 ] ; do --help) help=yes ;; + CC=*) + CC=`echo $1 | sed -e 's/^CC=//'` + ;; CPPFLAGS=*) CPPFLAGS=`echo $1 | sed -e 's/^CPPFLAGS=//'` ;; @@ -348,6 +352,7 @@ cat > $w/c/config.h << END END cat > $w/c/Mf-config << END +CC=$CC CPPFLAGS=$CPPFLAGS CFLAGS=$CFLAGS LDFLAGS=$LDFLAGS