Skip to content

Commit

Permalink
Merge branch 'feat/cherrypick-3175' into '4.14.4_csig' (merge request…
Browse files Browse the repository at this point in the history
… !25)

[build] support apple m1 build (apache#3175)
[build] support apple m1 build (apache#3175)

(cherry picked from commit dc2b0c5)
  • Loading branch information
zhiyuanlei committed Jul 13, 2022
2 parents 23cd0d1 + 3e9749e commit 51dd5b3
Show file tree
Hide file tree
Showing 2 changed files with 50 additions and 0 deletions.
12 changes: 12 additions & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1111,6 +1111,18 @@
</plugins>
</build>
</profile>
<profile>
<id>mac-apple-silicon</id>
<activation>
<os>
<family>mac</family>
<arch>aarch64</arch>
</os>
</activation>
<properties>
<nar.aolProperties>src/apple_m1_aol.properties</nar.aolProperties>
</properties>
</profile>

<profile>
<id>jdk11-no-spotbugs</id>
Expand Down
38 changes: 38 additions & 0 deletions src/apple_m1_aol.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
#
#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
#
#
aarch64.MacOSX.linker=g++

aarch64.MacOSX.gpp.c.compiler=gcc
aarch64.MacOSX.gpp.c.defines=Darwin GNU_GCC
aarch64.MacOSX.gpp.c.options=-Wall -Wno-long-long -Wpointer-arith -Wconversion
aarch64.MacOSX.gpp.c.includes=**/*.c
aarch64.MacOSX.gpp.c.excludes=

aarch64.MacOSX.gpp.java.include=include;include/darwin
aarch64.MacOSX.gpp.java.runtimeDirectory=IGNORED

aarch64.MacOSX.gpp.lib.prefix=lib
aarch64.MacOSX.gpp.shared.prefix=lib
aarch64.MacOSX.gpp.static.extension=a
aarch64.MacOSX.gpp.shared.extension=dylib
aarch64.MacOSX.gpp.plugin.extension=bundle
aarch64.MacOSX.gpp.jni.extension=jnilib
aarch64.MacOSX.gpp.executable.extension=

0 comments on commit 51dd5b3

Please sign in to comment.