diff --git a/configs/projects/_shared-compiler-settings.rb b/configs/projects/_shared-compiler-settings.rb index b8f93bf0..3f3eb367 100644 --- a/configs/projects/_shared-compiler-settings.rb +++ b/configs/projects/_shared-compiler-settings.rb @@ -1,8 +1,8 @@ # Define default CFLAGS and LDFLAGS for most platforms, and then # tweak or adjust them as needed. -proj.setting(:cppflags, "-I#{proj.includedir} -I/opt/pl-build-tools/include") +proj.setting(:cppflags, "-I#{proj.includedir}") proj.setting(:cflags, proj.cppflags) -proj.setting(:ldflags, "-L#{proj.libdir} -L/opt/pl-build-tools/lib -Wl,-rpath=#{proj.libdir}") +proj.setting(:ldflags, "-L#{proj.libdir} -Wl,-rpath=#{proj.libdir}") # Platform specific overrides or settings, which may override the defaults diff --git a/configs/projects/openbolt-runtime.rb b/configs/projects/openbolt-runtime.rb index 98be9b4f..00c76633 100644 --- a/configs/projects/openbolt-runtime.rb +++ b/configs/projects/openbolt-runtime.rb @@ -65,9 +65,8 @@ # Define default CFLAGS and LDFLAGS for most platforms, and then # tweak or adjust them as needed. - proj.setting(:cppflags, "-I#{proj.includedir}") - proj.setting(:cflags, proj.cppflags) - proj.setting(:ldflags, "-L#{proj.libdir} -Wl,-rpath=#{proj.libdir}") + # Load default compiler settings + instance_eval File.read('configs/projects/_shared-compiler-settings.rb') # Platform specific overrides or settings, which may override the defaults if platform.is_windows?