Skip to content

Commit

Permalink
remove remnants of osx
Browse files Browse the repository at this point in the history
  • Loading branch information
h-vetinari committed Jul 28, 2023
1 parent 6272906 commit a6e457f
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 12 deletions.
6 changes: 1 addition & 5 deletions recipe/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,9 @@ if [[ "$CONDA_BUILD_CROSS_COMPILATION" == "1" ]]; then
CMAKE_ARGS="$CMAKE_ARGS -DLLVM_CONFIG_PATH=$BUILD_PREFIX/bin/llvm-config -DMLIR_TABLEGEN_EXE=$BUILD_PREFIX/bin/mlir-tblgen"
fi

if [[ "${target_platform}" == linux-* ]]; then
# unclear segfaults with shared builds on osx
CMAKE_ARGS="$CMAKE_ARGS -DBUILD_SHARED_LIBS=ON"
fi

cmake -G Ninja \
${CMAKE_ARGS} \
-DBUILD_SHARED_LIBS=ON
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_CXX_STANDARD=17 \
-DCMAKE_EXPORT_COMPILE_COMMANDS=ON \
Expand Down
5 changes: 0 additions & 5 deletions recipe/conda_build_config.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,3 @@
c_compiler_version: # [osx]
- 17 # [osx]
cxx_compiler_version: # [osx]
- 17 # [osx]

channel_targets:
- conda-forge llvm_rc

Expand Down
2 changes: 0 additions & 2 deletions recipe/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,6 @@ outputs:
commands:
# shared lib on linux
- test -f $PREFIX/lib/libFortranRuntime.so # [linux]
# static lib on osx (segfaults with shared ones)
- test -f $PREFIX/lib/libFortranRuntime.a # [osx]
# static lib on win (fails to export symbols for shared build)
- if not exist %LIBRARY_LIB%\FortranRuntime.lib exit 1 # [win]

Expand Down

0 comments on commit a6e457f

Please sign in to comment.