lucy-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mar...@apache.org
Subject git commit: Revert "Use supplied custom cflags."
Date Sat, 19 Jul 2014 16:44:21 GMT
Repository: lucy-clownfish
Updated Branches:
  refs/heads/windows_fixes_for_0.4 fd9762ce0 -> c49617d98


Revert "Use supplied custom cflags."

This reverts commit 2a62a2f95ae3bedc7deac6d90f34ac0151ae3ab5.

The root of the Windows problem lies elsewhere, and using the custom
flags when compiling the XS file breaks lots of stuff.

These two commits will be eliminated before merging to master.


Project: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/commit/c49617d9
Tree: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/tree/c49617d9
Diff: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/diff/c49617d9

Branch: refs/heads/windows_fixes_for_0.4
Commit: c49617d98bafc589c9d7e6f1a8142f1cab9ac27a
Parents: fd9762c
Author: Marvin Humphrey <marvin@rectangular.com>
Authored: Sat Jul 19 09:41:51 2014 -0700
Committer: Marvin Humphrey <marvin@rectangular.com>
Committed: Sat Jul 19 09:42:44 2014 -0700

----------------------------------------------------------------------
 compiler/perl/lib/Clownfish/CFC/Perl/Build.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucy-clownfish/blob/c49617d9/compiler/perl/lib/Clownfish/CFC/Perl/Build.pm
----------------------------------------------------------------------
diff --git a/compiler/perl/lib/Clownfish/CFC/Perl/Build.pm b/compiler/perl/lib/Clownfish/CFC/Perl/Build.pm
index 2058ee3..1b6c04f 100644
--- a/compiler/perl/lib/Clownfish/CFC/Perl/Build.pm
+++ b/compiler/perl/lib/Clownfish/CFC/Perl/Build.pm
@@ -413,7 +413,7 @@ sub ACTION_compile_custom_xs {
         # Don't use Clownfish compiler flags for XS
         $cbuilder->compile(
             source               => $perl_binding_c_file,
-            extra_compiler_flags => $extra_cflags,
+            extra_compiler_flags => $self->extra_compiler_flags,
             include_dirs         => $self->include_dirs,
             object_file          => $perl_binding_o_file,
             # 'defines' is an undocumented parameter to compile(), so we


Mime
View raw message