diff options
| author | Felipe Contreras <felipe.contreras@gmail.com> | 2025-01-01 19:39:34 -0600 |
|---|---|---|
| committer | David Bremner <david@tethera.net> | 2025-03-01 08:33:09 -0500 |
| commit | 5f9fc7d81a95c380e933189c05558cbecfcfdb99 (patch) | |
| tree | 3664f88f7c500c1063ed14af681fbe8d68be1691 /bindings | |
| parent | 53cbb6d0cba6c4763b18f76467e73be21081daae (diff) | |
ruby: simplify build
We can just always add EXTRA_INCFLAGS and EXTRA_LDFLAGS.
Diffstat (limited to 'bindings')
| -rw-r--r-- | bindings/Makefile.local | 2 | ||||
| -rw-r--r-- | bindings/ruby/extconf.rb | 10 |
2 files changed, 3 insertions, 9 deletions
diff --git a/bindings/Makefile.local b/bindings/Makefile.local index 9875123a..eb932613 100644 --- a/bindings/Makefile.local +++ b/bindings/Makefile.local @@ -9,8 +9,8 @@ $(dir)/ruby.stamp: lib/$(LINKER_NAME) ifeq ($(HAVE_RUBY_DEV),1) cd $(dir)/ruby && \ EXTRA_LDFLAGS="$(NO_UNDEFINED_LDFLAGS)" \ + EXTRA_INCFLAGS="-I$(NOTMUCH_SRCDIR)/lib" \ LIBNOTMUCH="../../lib/$(LINKER_NAME)" \ - NOTMUCH_SRCDIR='$(NOTMUCH_SRCDIR)' \ $(RUBY) extconf.rb --vendor $(MAKE) -C $(dir)/ruby CFLAGS="$(CFLAGS) -pipe -fno-plt -fPIC" && touch $@ endif diff --git a/bindings/ruby/extconf.rb b/bindings/ruby/extconf.rb index d914537c..7cec711f 100644 --- a/bindings/ruby/extconf.rb +++ b/bindings/ruby/extconf.rb @@ -5,14 +5,8 @@ require 'mkmf' -dir = File.join(ENV['NOTMUCH_SRCDIR'], 'lib') - -# includes -$INCFLAGS = "-I#{dir} #{$INCFLAGS}" - -if ENV['EXTRA_LDFLAGS'] - $LDFLAGS += " " + ENV['EXTRA_LDFLAGS'] -end +$INCFLAGS = "#{ENV['EXTRA_INCFLAGS']} #{$INCFLAGS}" +$LDFLAGS = "#{ENV['EXTRA_LDFLAGS']} #{$LDFLAGS}" if not ENV['LIBNOTMUCH'] exit 1 |