[sr-dev] git:master:1d06db87: Merge pull request #1204 from dunst0/fix/app_sqlang

Module: kamailio Branch: master Commit: 1d06db87f88841f4aa540b4f1554bed31da2ec25 URL: https://github.com/kamailio/kamailio/commit/1d06db87f88841f4aa540b4f1554bed… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2017-08-07T21:57:13+02:00 Merge pull request #1204 from dunst0/fix/app_sqlang app_sqlang: fix static make and gcc in Makefiles --- Modified: src/modules/app_sqlang/Makefile Modified: src/modules/app_sqlang/squirrel/sqstdlib/Makefile Modified: src/modules/app_sqlang/squirrel/squirrel/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/1d06db87f88841f4aa540b4f1554bed… Patch: https://github.com/kamailio/kamailio/commit/1d06db87f88841f4aa540b4f1554bed… --- diff --git a/src/modules/app_sqlang/Makefile b/src/modules/app_sqlang/Makefile index 9766b2d845..153f414884 100644 --- a/src/modules/app_sqlang/Makefile +++ b/src/modules/app_sqlang/Makefile @@ -20,11 +20,11 @@ endif include ../../Makefile.modules libsquirrel.a: - make -C ./squirrel/squirrel CC_EXTRA_FLAGS="-fPIC" \ + $(MAKE) -C ./squirrel/squirrel CC_EXTRA_FLAGS="-fPIC" \ OUT="../../libsquirrel.a" $(MKSQLANG) libsqstdlib.a: - make -C ./squirrel/sqstdlib CC_EXTRA_FLAGS="-fPIC" \ + $(MAKE) -C ./squirrel/sqstdlib CC_EXTRA_FLAGS="-fPIC" \ OUT="../../libsqstdlib.a" $(MKSQLANG) app_sqlang.so: libsquirrel.a libsqstdlib.a diff --git a/src/modules/app_sqlang/squirrel/sqstdlib/Makefile b/src/modules/app_sqlang/squirrel/sqstdlib/Makefile index 14c33948ea..cc1fbe94fb 100644 --- a/src/modules/app_sqlang/squirrel/sqstdlib/Makefile +++ b/src/modules/app_sqlang/squirrel/sqstdlib/Makefile @@ -27,16 +27,16 @@ SRCS= \ sq32: - gcc -O2 -fno-exceptions -fPIC -fno-rtti -Wall -fno-strict-aliasing -c $(SRCS) $(INCZ) $(DEFS) + $(CC) -O2 -fno-exceptions -fPIC -fno-rtti -Wall -fno-strict-aliasing -c $(SRCS) $(INCZ) $(DEFS) ar rc $(OUT) *.o rm *.o sqprof: - gcc -O2 -pg -fno-exceptions -fno-rtti -pie -gstabs -g3 -Wall -fno-strict-aliasing -c $(SRCS) $(INCZ) $(DEFS) + $(CC) -O2 -pg -fno-exceptions -fno-rtti -pie -gstabs -g3 -Wall -fno-strict-aliasing -c $(SRCS) $(INCZ) $(DEFS) ar rc $(OUT) *.o rm *.o sq64: - gcc -O2 -m64 -fno-exceptions -fPIC -D_SQ64 -fno-rtti -Wall -fno-strict-aliasing -c $(SRCS) $(INCZ) $(DEFS) + $(CC) -O2 -m64 -fno-exceptions -fPIC -D_SQ64 -fno-rtti -Wall -fno-strict-aliasing -c $(SRCS) $(INCZ) $(DEFS) ar rc $(OUT) *.o rm *.o diff --git a/src/modules/app_sqlang/squirrel/squirrel/Makefile b/src/modules/app_sqlang/squirrel/squirrel/Makefile index ce9359d2e9..cda7d248a5 100644 --- a/src/modules/app_sqlang/squirrel/squirrel/Makefile +++ b/src/modules/app_sqlang/squirrel/squirrel/Makefile @@ -36,16 +36,16 @@ SRCS= \ sq32: - gcc -O2 -fno-exceptions -fPIC -fno-rtti -Wall -fno-strict-aliasing -c $(SRCS) $(INCZ) $(DEFS) + $(CC) -O2 -fno-exceptions -fPIC -fno-rtti -Wall -fno-strict-aliasing -c $(SRCS) $(INCZ) $(DEFS) ar rc $(OUT) *.o rm *.o sqprof: - gcc -O2 -pg -fno-exceptions -fno-rtti -pie -gstabs -g3 -Wall -fno-strict-aliasing -c $(SRCS) $(INCZ) $(DEFS) + $(CC) -O2 -pg -fno-exceptions -fno-rtti -pie -gstabs -g3 -Wall -fno-strict-aliasing -c $(SRCS) $(INCZ) $(DEFS) ar rc $(OUT) *.o rm *.o sq64: - gcc -O2 -m64 -D_SQ64 -fno-exceptions -fPIC -fno-rtti -Wall -fno-strict-aliasing -c $(SRCS) $(INCZ) $(DEFS) + $(CC) -O2 -m64 -D_SQ64 -fno-exceptions -fPIC -fno-rtti -Wall -fno-strict-aliasing -c $(SRCS) $(INCZ) $(DEFS) ar rc $(OUT) *.o rm *.o