Skip to content

Commit d6bbe46

Browse files
committed
Use shared compiler settings for openbolt-runtime
Since we've centralized and standardized the way we define some of the compiler settings, this adds the shared compiler default settings to openbolt-runtime. It also removes the usless declarations of pl-build-tools locations, since we don't use those.
1 parent fa8a303 commit d6bbe46

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

configs/projects/_shared-compiler-settings.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# Define default CFLAGS and LDFLAGS for most platforms, and then
22
# tweak or adjust them as needed.
3-
proj.setting(:cppflags, "-I#{proj.includedir} -I/opt/pl-build-tools/include")
3+
proj.setting(:cppflags, "-I#{proj.includedir}")
44
proj.setting(:cflags, proj.cppflags)
5-
proj.setting(:ldflags, "-L#{proj.libdir} -L/opt/pl-build-tools/lib -Wl,-rpath=#{proj.libdir}")
5+
proj.setting(:ldflags, "-L#{proj.libdir} -Wl,-rpath=#{proj.libdir}")
66

77
# Platform specific overrides or settings, which may override the defaults
88

configs/projects/openbolt-runtime.rb

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,9 +65,8 @@
6565

6666
# Define default CFLAGS and LDFLAGS for most platforms, and then
6767
# tweak or adjust them as needed.
68-
proj.setting(:cppflags, "-I#{proj.includedir}")
69-
proj.setting(:cflags, proj.cppflags)
70-
proj.setting(:ldflags, "-L#{proj.libdir} -Wl,-rpath=#{proj.libdir}")
68+
# Load default compiler settings
69+
instance_eval File.read('configs/projects/_shared-compiler-settings.rb')
7170

7271
# Platform specific overrides or settings, which may override the defaults
7372
if platform.is_windows?

0 commit comments

Comments
 (0)