diff options
| author |  Derek Perez <pzd@google.com> | 2016-01-07 17:31:42 +0000 |
|---|---|---|
| committer |  Damien Martin-Guillerez <dmarting@google.com> | 2016-01-07 20:20:13 +0000 |
| commit | 8fb876f50c46d8556f46afa2c6e766f74e12e399 (patch) | |
| tree | 9ca63c619c8fd93dbaf31ede41a5941eab7cef23 /tools | |
| parent | f1e257da1467760e7d2f4b3b1f651484f4fe7b67 (diff) | |
making sass work better in different linux situations, minor cleanup overall.
--
Change-Id: I116d8f3f5dcae97bf78601db60b0fcef0e630228
Reviewed-on: https://bazel-review.googlesource.com/#/c/2630/
MOS_MIGRATED_REVID=111611226
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/build_defs/sass/libsass.BUILD | 11 | ||||
| -rw-r--r-- | tools/build_defs/sass/sass.bzl | 2 | ||||
| -rw-r--r-- | tools/build_defs/sass/sassc.BUILD | 7 |
3 files changed, 11 insertions, 9 deletions
diff --git a/tools/build_defs/sass/libsass.BUILD b/tools/build_defs/sass/libsass.BUILD index d2bd5f6d60..42368036d8 100644 --- a/tools/build_defs/sass/libsass.BUILD +++ b/tools/build_defs/sass/libsass.BUILD @@ -1,16 +1,17 @@ package(default_visibility = ["@sassc//:__pkg__"]) -BASE_DIR = "libsass-3.3.0-beta1/" - filegroup( name = "srcs", srcs = glob([ - BASE_DIR + "src/**/*.h*", - BASE_DIR + "src/**/*.c*", + "src/**/*.h*", + "src/**/*.c*", ]), ) +# Includes directive may seem unnecessary here, but its needed for the weird +# interplay between libsass/sassc projects. This is intentional. cc_library( name = "headers", - includes = [BASE_DIR + "include"], + includes = ["include"], + hdrs = glob(["include/**/*.h"]), )
\ No newline at end of file diff --git a/tools/build_defs/sass/sass.bzl b/tools/build_defs/sass/sass.bzl index e15a2efc18..2de0d71d41 100644 --- a/tools/build_defs/sass/sass.bzl +++ b/tools/build_defs/sass/sass.bzl @@ -94,6 +94,7 @@ def sass_repositories(): url = "https://github.com/sass/libsass/archive/3.3.0-beta1.tar.gz", sha256 = "6a4da39cc0b585f7a6ee660dc522916f0f417c890c3c0ac7ebbf6a85a16d220f", build_file = "tools/build_defs/sass/libsass.BUILD", + strip_prefix = "libsass-3.3.0-beta1", ) native.new_http_archive( @@ -101,4 +102,5 @@ def sass_repositories(): url = "https://github.com/sass/sassc/archive/3.3.0-beta1.tar.gz", sha256 = "87494218eea2441a7a24b40f227330877dbba75c5fa9014ac6188711baed53f6", build_file = "tools/build_defs/sass/sassc.BUILD", + strip_prefix = "sassc-3.3.0-beta1", ) diff --git a/tools/build_defs/sass/sassc.BUILD b/tools/build_defs/sass/sassc.BUILD index 6ec0432d83..58e87082ab 100644 --- a/tools/build_defs/sass/sassc.BUILD +++ b/tools/build_defs/sass/sassc.BUILD @@ -1,13 +1,12 @@ package(default_visibility = ["//tools/build_defs/sass:__pkg__"]) -BASE_DIR = "sassc-3.3.0-beta1/" - cc_binary( name = "sassc", srcs = [ "@libsass//:srcs", - BASE_DIR + "sassc.c", - ], + "sassc.c", + "sassc_version.h", +], linkopts = ["-ldl", "-lm"], deps = ["@libsass//:headers"], ) |