Try to make installation on Windows possible

niner · Aug 5, 2016 · 62d7a43 · 62d7a43
1 parent 31c529a
commit 62d7a43
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git a/Build.pm b/Build.pm
@@ -13,6 +13,7 @@ class Build is Panda::Builder {
 
         my %vars = get-vars($dir);
         %vars<p5helper> = $*VM.platform-library-name('p5helper'.IO);
+        %vars<perlopts> = run(<perl -MExtUtils::Embed -e ccopts -e ldopts>, :out).out.lines.join('');
         mkdir "$dir/resources" unless "$dir/resources".IO.e;
         mkdir "$dir/resources/libraries" unless "$dir/resources/libraries".IO.e;
         process-makefile($dir, %vars);

diff --git a/Makefile.in b/Makefile.in
@@ -3,6 +3,6 @@ all: %DESTDIR%/resources/libraries/%p5helper%
 clean:
 	rm %DESTDIR%/resources/libraries/%p5helper%
 %DESTDIR%/resources/libraries/%p5helper%: p5helper.c
-	gcc -Wall p5helper.c `perl -MExtUtils::Embed -e ccopts -e ldopts` -shared -o %DESTDIR%/resources/libraries/%p5helper% -fPIC -g
+	cc -Wall p5helper.c %perlopts% -shared -o %DESTDIR%/resources/libraries/%p5helper% -fPIC -g
 test: all
 	prove -e 'perl6 -Ilib' t
diff --git a/configure.pl6 b/configure.pl6
@@ -10,6 +10,7 @@ shell('perl -MFilter::Simple -e ""')
 
 my %vars = get-vars('.');
 %vars<p5helper> = $*VM.platform-library-name('p5helper'.IO);
+%vars<perlopts> = run(<perl -MExtUtils::Embed -e ccopts -e ldopts>, :out).out.lines.join('');
 mkdir "resources" unless "resources".IO.e;
 mkdir "resources/libraries" unless "resources/libraries".IO.e;
 process-makefile('.', %vars);