commit 397a236d8b13b69226797bae7304d71b607e53a5
parent cb6844b58a49f51b48160a3787cfea36bd3650f2
Author: Kyle Milz <kyle@getaddrinfo.net>
Date: Thu, 16 Jun 2016 00:18:26 -0600
Test: use .a on osx too
Diffstat:
2 files changed, 1 insertion(+), 11 deletions(-)
diff --git a/Jamrules b/Jamrules
@@ -37,8 +37,6 @@ if $(OS) = OPENBSD {
}
if $(OS) = MACOSX {
- SHLIB_SUF = dylib ;
-
CLANG_INCL = "-I/opt/local/libexec/llvm-3.7/lib/clang/3.7/include" ;
C++FLAGS = -Wno-deprecated -DLLVM_VER=37 ;
@@ -46,10 +44,6 @@ if $(OS) = MACOSX {
LINKLIBS on citrun-gl = -framework OpenGL -framework GLUT ;
LINKLIBS on citrun-gl += -lc++ -lm ;
- # We must specify that the entry point will be available at runtime
- LINKFLAGS on libcitrun.$(SHLIB_SUF) = -Wl,-U,_citrun_nodes ;
- LINKFLAGS on libcitrun.$(SHLIB_SUF) += -Wl,-U,_citrun_nodes_total ;
-
LINKLIBS on citrun-inst =
-lc++
-lclangAST
diff --git a/Test/Project.pm b/Test/Project.pm
@@ -52,11 +52,7 @@ EOF
# Use the tools in this source tree
my $cwd = getcwd;
$ENV{CITRUN_PATH} = "$cwd/share";
-
- $ENV{CITRUN_LIB} = "$cwd/lib/libcitrun.a" if ($^O eq "openbsd");
- $ENV{CITRUN_LIB} = "$cwd/lib/libcitrun.dylib" if ($^O eq "darwin");
- $ENV{CITRUN_LIB} = "$cwd/lib/libcitrun.so" if ($^O eq "linux");
-
+ $ENV{CITRUN_LIB} = "$cwd/lib/libcitrun.a";
$ENV{PATH} = "$ENV{CITRUN_PATH}:$ENV{PATH}";
my $ret = system( "cd $tmp_dir && jam" );