Skip to content

Commit 331d26c

Browse files
kgrytekgryte
committed
Remove duplicated variable logic
1 parent b277c51 commit 331d26c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+7
-352
lines changed

‎tools/make/lib/ls/Makefile‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -273,6 +273,13 @@ FIND_TESTS_FIXTURES_EXCLUDE_FLAGS ?= \
273273
-not -path "$(TOOLS_DIR)/*" \
274274
-not -path "$(TOOLS_PKGS_DIR)/*"
275275

276+
# On Mac OSX, in order to use `|` and other regular expression operators, we need to use enhanced regular expression syntax (-E); see https://developer.apple.com/library/mac/documentation/Darwin/Reference/ManPages/man7/re_format.7.html#//apple_ref/doc/man/7/re_format.
277+
ifeq ($(OS), Darwin)
278+
find_kernel_prefix := -E
279+
else
280+
find_kernel_prefix :=
281+
endif
282+
276283

277284
# DEPENDENCIES #
278285

‎tools/make/lib/ls/c/benchmarks.mk‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,6 @@
1818

1919
# VARIABLES #
2020

21-
# On Mac OSX, in order to use `|` and other regular expression operators, we need to use enhanced regular expression syntax (-E); see https://developer.apple.com/library/mac/documentation/Darwin/Reference/ManPages/man7/re_format.7.html#//apple_ref/doc/man/7/re_format.
22-
23-
ifeq ($(OS), Darwin)
24-
find_kernel_prefix := -E
25-
else
26-
find_kernel_prefix :=
27-
endif
28-
2921
# Define a suffix for pretty printing results as a list:
3022
find_print_c_benchmarks_list := -exec printf '%s\n' {} \;
3123

‎tools/make/lib/ls/c/examples.mk‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,6 @@
1818

1919
# VARIABLES #
2020

21-
# On Mac OSX, in order to use `|` and other regular expression operators, we need to use enhanced regular expression syntax (-E); see https://developer.apple.com/library/mac/documentation/Darwin/Reference/ManPages/man7/re_format.7.html#//apple_ref/doc/man/7/re_format.
22-
23-
ifeq ($(OS), Darwin)
24-
find_kernel_prefix := -E
25-
else
26-
find_kernel_prefix :=
27-
endif
28-
2921
# Define a suffix for pretty printing results as a list:
3022
find_print_c_examples_list := -exec printf '%s\n' {} \;
3123

‎tools/make/lib/ls/c/files.mk‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,6 @@
1818

1919
# VARIABLES #
2020

21-
# On Mac OSX, in order to use `|` and other regular expression operators, we need to use enhanced regular expression syntax (-E); see https://developer.apple.com/library/mac/documentation/Darwin/Reference/ManPages/man7/re_format.7.html#//apple_ref/doc/man/7/re_format.
22-
23-
ifeq ($(OS), Darwin)
24-
find_kernel_prefix := -E
25-
else
26-
find_kernel_prefix :=
27-
endif
28-
2921
# Define a suffix for pretty printing results as a list:
3022
find_print_c_list := -exec printf '%s\n' {} \;
3123

‎tools/make/lib/ls/c/sources.mk‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,6 @@
1818

1919
# VARIABLES #
2020

21-
# On Mac OSX, in order to use `|` and other regular expression operators, we need to use enhanced regular expression syntax (-E); see https://developer.apple.com/library/mac/documentation/Darwin/Reference/ManPages/man7/re_format.7.html#//apple_ref/doc/man/7/re_format.
22-
23-
ifeq ($(OS), Darwin)
24-
find_kernel_prefix := -E
25-
else
26-
find_kernel_prefix :=
27-
endif
28-
2921
# Define a suffix for pretty printing results as a list:
3022
find_print_c_sources_list := -exec printf '%s\n' {} \;
3123

‎tools/make/lib/ls/c/tests_fixtures.mk‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,6 @@
1818

1919
# VARIABLES #
2020

21-
# On Mac OSX, in order to use `|` and other regular expression operators, we need to use enhanced regular expression syntax (-E); see https://developer.apple.com/library/mac/documentation/Darwin/Reference/ManPages/man7/re_format.7.html#//apple_ref/doc/man/7/re_format.
22-
23-
ifeq ($(OS), Darwin)
24-
find_kernel_prefix := -E
25-
else
26-
find_kernel_prefix :=
27-
endif
28-
2921
# Define a suffix for pretty printing results as a list:
3022
find_print_c_tests_fixtures_list := -exec printf '%s\n' {} \;
3123

‎tools/make/lib/ls/cpp/benchmarks.mk‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,6 @@
1818

1919
# VARIABLES #
2020

21-
# On Mac OSX, in order to use `|` and other regular expression operators, we need to use enhanced regular expression syntax (-E); see https://developer.apple.com/library/mac/documentation/Darwin/Reference/ManPages/man7/re_format.7.html#//apple_ref/doc/man/7/re_format.
22-
23-
ifeq ($(OS), Darwin)
24-
find_kernel_prefix := -E
25-
else
26-
find_kernel_prefix :=
27-
endif
28-
2921
# Define a suffix for pretty printing results as a list:
3022
find_print_cpp_benchmarks_list := -exec printf '%s\n' {} \;
3123

‎tools/make/lib/ls/cpp/examples.mk‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,6 @@
1818

1919
# VARIABLES #
2020

21-
# On Mac OSX, in order to use `|` and other regular expression operators, we need to use enhanced regular expression syntax (-E); see https://developer.apple.com/library/mac/documentation/Darwin/Reference/ManPages/man7/re_format.7.html#//apple_ref/doc/man/7/re_format.
22-
23-
ifeq ($(OS), Darwin)
24-
find_kernel_prefix := -E
25-
else
26-
find_kernel_prefix :=
27-
endif
28-
2921
# Define a suffix for pretty printing results as a list:
3022
find_print_cpp_examples_list := -exec printf '%s\n' {} \;
3123

‎tools/make/lib/ls/cpp/files.mk‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,6 @@
1818

1919
# VARIABLES #
2020

21-
# On Mac OSX, in order to use `|` and other regular expression operators, we need to use enhanced regular expression syntax (-E); see https://developer.apple.com/library/mac/documentation/Darwin/Reference/ManPages/man7/re_format.7.html#//apple_ref/doc/man/7/re_format.
22-
23-
ifeq ($(OS), Darwin)
24-
find_kernel_prefix := -E
25-
else
26-
find_kernel_prefix :=
27-
endif
28-
2921
# Define a suffix for pretty printing results as a list:
3022
find_print_cpp_list := -exec printf '%s\n' {} \;
3123

‎tools/make/lib/ls/cpp/sources.mk‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,6 @@
1818

1919
# VARIABLES #
2020

21-
# On Mac OSX, in order to use `|` and other regular expression operators, we need to use enhanced regular expression syntax (-E); see https://developer.apple.com/library/mac/documentation/Darwin/Reference/ManPages/man7/re_format.7.html#//apple_ref/doc/man/7/re_format.
22-
23-
ifeq ($(OS), Darwin)
24-
find_kernel_prefix := -E
25-
else
26-
find_kernel_prefix :=
27-
endif
28-
2921
# Define a suffix for pretty printing results as a list:
3022
find_print_cpp_sources_list := -exec printf '%s\n' {} \;
3123

0 commit comments

Comments
 (0)