summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLamont Granquist <lamont@scriptkiddie.org>2021-04-06 20:23:01 -0700
committerLamont Granquist <lamont@scriptkiddie.org>2021-04-06 20:23:01 -0700
commit69b59f47a8d38a77820233671c1edeb794d023e1 (patch)
tree627ec8e321c3b4e7b34a289d2cf6bb6fe8ace388
parent22e1dae2886caeb74361121ff271ba14bdaec667 (diff)
downloadlibyajl2-gem-69b59f47a8d38a77820233671c1edeb794d023e1.tar.gz
Apply correct LDFLAGS on windows with ruby-3.0
For whatever reason the CC variable has changed in our ruby-3.0 builds and we cannot identify it by checking for clang/gcc like this. Since we only support using clang/gcc on windows for builds anyway, we omit the check. Signed-off-by: Lamont Granquist <lamont@scriptkiddie.org>
-rw-r--r--ext/libyajl2/extconf.rb8
1 files changed, 4 insertions, 4 deletions
diff --git a/ext/libyajl2/extconf.rb b/ext/libyajl2/extconf.rb
index 07afbe7..3038386 100644
--- a/ext/libyajl2/extconf.rb
+++ b/ext/libyajl2/extconf.rb
@@ -48,11 +48,11 @@ module Libyajl2Build
# magic flags copied from upstream yajl build system (-std=c99 is necessary for older gcc)
$CFLAGS << " -std=c99 -pedantic -Wpointer-arith -Wno-format-y2k -Wstrict-prototypes -Wmissing-declarations -Wnested-externs -Wextra -Wundef -Wwrite-strings -Wold-style-definition -Wredundant-decls -Wno-unused-parameter -Wno-sign-compare -Wmissing-prototypes"
$CFLAGS << " -O2" # match what the upstream uses for optimization
+ end
- # create the implib on windows
- if windows?
- $LDFLAGS << " -Wl,--export-all-symbols -Wl,--enable-auto-import -Wl,--out-implib=libyajldll.a -Wl,--output-def,libyajl.def"
- end
+ # create the implib on windows
+ if windows?
+ $LDFLAGS << " -Wl,--export-all-symbols -Wl,--enable-auto-import -Wl,--out-implib=libyajldll.a -Wl,--output-def,libyajl.def"
end
$CFLAGS << " -DNDEBUG"