Description: handle ADAFLAGS CFLAGS CPPFLAGS LDFLAGS Author: Nicolas Boulenguez Forwarded: not-needed --- a/gnatcoll_db2ada/gnatcoll_all2ada.gpr +++ b/gnatcoll_db2ada/gnatcoll_all2ada.gpr @@ -49,9 +49,13 @@ when "PROD" => -- Do not use -gnatwe for production mode - for Switches ("Ada") use ("-O2", "-gnatn", "-gnatwaCJ"); + for Switches ("Ada") use ("-O2", "-gnatn", "-gnatwaCJ") + & External_As_List ("ADAFLAGS", " "); end case; end Compiler; + package Linker is + for Leading_Switches ("Ada") use External_As_List ("LDFLAGS", " "); + end Linker; package Binder is case Build is --- a/gnatcoll_db2ada/gnatcoll_db2ada.gpr +++ b/gnatcoll_db2ada/gnatcoll_db2ada.gpr @@ -46,9 +46,13 @@ when "PROD" => -- Do not use -gnatwe for production mode - for Switches ("Ada") use ("-O2", "-gnatn", "-gnatwaCJ"); + for Switches ("Ada") use ("-O2", "-gnatn", "-gnatwaCJ") + & External_As_List ("ADAFLAGS", " "); end case; end Compiler; + package Linker is + for Leading_Switches ("Ada") use External_As_List ("LDFLAGS", " "); + end Linker; package Binder is case Build is --- a/gnatcoll_db2ada/gnatcoll_postgres2ada.gpr +++ b/gnatcoll_db2ada/gnatcoll_postgres2ada.gpr @@ -47,9 +47,13 @@ when "PROD" => -- Do not use -gnatwe for production mode - for Switches ("Ada") use ("-O2", "-gnatn", "-gnatwaCJ"); + for Switches ("Ada") use ("-O2", "-gnatn", "-gnatwaCJ") + & External_As_List ("ADAFLAGS", " "); end case; end Compiler; + package Linker is + for Leading_Switches ("Ada") use External_As_List ("LDFLAGS", " "); + end Linker; package Binder is case Build is --- a/gnatcoll_db2ada/gnatcoll_sqlite2ada.gpr +++ b/gnatcoll_db2ada/gnatcoll_sqlite2ada.gpr @@ -48,9 +48,13 @@ when "PROD" => -- Do not use -gnatwe for production mode - for Switches ("Ada") use ("-O2", "-gnatn", "-gnatwaCJ"); + for Switches ("Ada") use ("-O2", "-gnatn", "-gnatwaCJ") + & External_As_List ("ADAFLAGS", " "); end case; end Compiler; + package Linker is + for Leading_Switches ("Ada") use External_As_List ("LDFLAGS", " "); + end Linker; package Binder is case Build is --- a/gnatinspect/gnatinspect.gpr +++ b/gnatinspect/gnatinspect.gpr @@ -47,9 +47,13 @@ when "PROD" => -- Do not use -gnatwe for production mode - for Switches ("Ada") use ("-O2", "-gnatn", "-gnatwaCJ"); + for Switches ("Ada") use ("-O2", "-gnatn", "-gnatwaCJ") + & External_As_List ("ADAFLAGS", " "); end case; end Compiler; + package Linker is + for Leading_Switches ("Ada") use External_As_List ("LDFLAGS", " "); + end Linker; package Binder is for Switches ("Ada") use ("-E"); --- a/postgres/gnatcoll_postgres.gpr +++ b/postgres/gnatcoll_postgres.gpr @@ -40,10 +40,11 @@ for Object_Dir use "obj/" & Project'Library_Kind; for Library_Dir use "lib/" & Project'Library_Kind; for Library_Name use Name; - for Library_Version use "lib" & Name & Gnatcoll.So_Ext & "." & Version; + for Library_Version use "lib" & Name & ".so." & Version; case Library_Type is when "relocatable" => + for Leading_Library_Options use External_As_List ("LDFLAGS", " "); for Library_Options use ("-lpq"); for Library_Interface use ("gnatcoll.sql.postgres", "gnatcoll.sql.ranges"); @@ -78,8 +79,11 @@ when "PROD" => -- Do not use -gnatwe for production mode - for Switches ("Ada") use ("-O2", "-gnatn", "-gnatwaCJ"); - for Switches ("C") use ("-O2", "-Wunreachable-code") & PQP_Flag; + for Switches ("Ada") use ("-O2", "-gnatn", "-gnatwaCJ") + & External_As_List ("ADAFLAGS", " "); + for Switches ("C") use ("-O2", "-Wunreachable-code") & PQP_Flag + & External_As_List ("CFLAGS", " ") + & External_As_List ("CPPFLAGS", " "); end case; end Compiler; --- a/sql/gnatcoll_sql.gpr +++ b/sql/gnatcoll_sql.gpr @@ -41,7 +41,8 @@ for Library_Dir use "lib/" & Project'Library_Kind; for Library_Name use Name; - for Library_Version use "lib" & Name & Gnatcoll.So_Ext & "." & Version; + for Library_Version use "lib" & Name & ".so." & Version; + for Leading_Library_Options use External_As_List ("LDFLAGS", " "); for Languages use ("Ada"); @@ -57,7 +58,8 @@ when "PROD" => -- Do not use -gnatwe for production mode - for Switches ("Ada") use ("-O2", "-gnatn", "-gnatwaCJ"); + for Switches ("Ada") use ("-O2", "-gnatn", "-gnatwaCJ") + & External_As_List ("ADAFLAGS", " "); end case; end Compiler; --- a/sqlite/gnatcoll_sqlite.gpr +++ b/sqlite/gnatcoll_sqlite.gpr @@ -40,7 +40,7 @@ for Object_Dir use "obj/" & Project'Library_Kind; for Library_Dir use "lib/" & Project'Library_Kind; for Library_Name use Name; - for Library_Version use "lib" & Name & Gnatcoll.So_Ext & "." & Version; + for Library_Version use "lib" & Name & ".so." & Version; for Languages use ("Ada", "C"); @@ -48,6 +48,7 @@ case Library_Type is when "relocatable" => + for Leading_Library_Options use External_As_List ("LDFLAGS", " "); for Library_Interface use ("gnatcoll.sql.sqlite"); when others => null; @@ -81,8 +82,11 @@ when "PROD" => -- Do not use -gnatwe for production mode - for Switches ("Ada") use ("-O2", "-gnatn", "-gnatwaCJ"); - for Switches ("C") use ("-O2", "-Wunreachable-code"); + for Switches ("Ada") use ("-O2", "-gnatn", "-gnatwaCJ") + & External_As_List ("ADAFLAGS", " "); + for Switches ("C") use ("-O2", "-Wunreachable-code") + & External_As_List ("CFLAGS", " ") + & External_As_List ("CPPFLAGS", " "); end case; case Sqlite_Dep is --- a/xref/gnatcoll_xref.gpr +++ b/xref/gnatcoll_xref.gpr @@ -44,7 +44,8 @@ for Library_Dir use "lib/" & Project'Library_Kind; for Library_Name use Name; - for Library_Version use "lib" & Name & Gnatcoll.So_Ext & "." & Version; + for Library_Version use "lib" & Name & ".so." & Version; + for Leading_Library_Options use External_As_List ("LDFLAGS", " "); for Languages use ("Ada"); @@ -60,7 +61,8 @@ when "PROD" => -- Do not use -gnatwe for production mode - for Switches ("Ada") use ("-O2", "-gnatn", "-gnatwaCJ"); + for Switches ("Ada") use ("-O2", "-gnatn", "-gnatwaCJ") + & External_As_List ("ADAFLAGS", " "); end case; end Compiler;